diff options
author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
---|---|---|
committer | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2007-12-07 01:20:16 +0900 |
commit | 521dcd30b9cc5b72cd27ae04104f19369251aa20 (patch) | |
tree | bc33710a3ae6f97f0dcae8f02fd6f3c91322d96d /common/cmd_net.c | |
parent | 260eea5676ca46903a335686cc020b29c4ca46fe (diff) | |
parent | 8d4f040a3c15036a6ea25a9c39e7d89fefa8440d (diff) | |
download | talos-obmc-uboot-521dcd30b9cc5b72cd27ae04104f19369251aa20.tar.gz talos-obmc-uboot-521dcd30b9cc5b72cd27ae04104f19369251aa20.zip |
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/Makefile
Diffstat (limited to 'common/cmd_net.c')
-rw-r--r-- | common/cmd_net.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/common/cmd_net.c b/common/cmd_net.c index 0715fbc203..21682c09e9 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -28,8 +28,6 @@ #include <command.h> #include <net.h> -#if defined(CONFIG_CMD_NET) - extern int do_bootm (cmd_tbl_t *, int, int, char *[]); static int netboot_common (proto_t, cmd_tbl_t *, int , char *[]); @@ -343,5 +341,3 @@ U_BOOT_CMD( "[NTP server IP]\n" ); #endif - -#endif |