diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-03-28 00:04:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-03-28 00:04:18 +0100 |
| commit | be1a91320ce0cb7330bb650d1576bb56c55092af (patch) | |
| tree | f6bb6d34565d4f5b3386a23885fb3df6c17e0456 /common | |
| parent | 6b94b4962211c16ee2197048faa887e1f92f3757 (diff) | |
| parent | 9d3a86aec52cb3c0e9badd12167d9292184ce4dd (diff) | |
| download | blackbird-obmc-uboot-be1a91320ce0cb7330bb650d1576bb56c55092af.tar.gz blackbird-obmc-uboot-be1a91320ce0cb7330bb650d1576bb56c55092af.zip | |
Merge branch 'next' of git://git.denx.de/u-boot-coldfire into next
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bdinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index f8400bcc04..d22eb6634a 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR; static void print_num(const char *, ulong); -#if !defined(CONFIG_ARM) || defined(CONFIG_CMD_NET) +#if !(defined(CONFIG_ARM) || defined(CONFIG_M68K)) || defined(CONFIG_CMD_NET) static void print_eth(int idx); #endif @@ -350,7 +350,7 @@ static void print_num(const char *name, ulong value) printf ("%-12s= 0x%08lX\n", name, value); } -#if !defined(CONFIG_ARM) || defined(CONFIG_CMD_NET) +#if !(defined(CONFIG_ARM) || defined(CONFIG_M68K)) || defined(CONFIG_CMD_NET) static void print_eth(int idx) { char name[10], *val; |
