Fix merge problems

[karo-tx-uboot.git] / include / configs / MVBC_P.h

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 04580b7a2642002094a5a1c63711092fc80a5e23..8c8a445c8b3ce7f75d6ebdd5b5f0d70bee641bff 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -40,7 +40,7 @@
 #define CONFIG_MISC_INIT_R     1
 
 #define CFG_CACHELINE_SIZE     32
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#ifdef (CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT    5
 #endif
 
@@ -255,7 +255,7 @@
 #define CONFIG_NET_RETRY_COUNT 5
 
 #define CONFIG_E1000
-#define CONFIG_E1000_FALLBACK_MAC      0xb6b445ebfbc0
+#define CONFIG_E1000_FALLBACK_MAC      { 0xb6, 0xb4, 0x45, 0xeb, 0xfb, 0xc0 }
 #undef CONFIG_MPC5xxx_FEC
 #undef CONFIG_PHY_ADDR
 #define CONFIG_NETDEV          eth0
@@ -268,7 +268,7 @@
 #define CFG_PROMPT_HUSH_PS2    "> "
 #undef         CFG_LONGHELP
 #define CFG_PROMPT             "=> "
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#ifdef (CONFIG_CMD_KGDB)
 #define CFG_CBSIZE             1024
 #else
 #define CFG_CBSIZE             256