Merge branch 'master' of git://git.denx.de/u-boot-i2c

[karo-tx-uboot.git] / board / bmw / bmw.c

diff --git a/board/bmw/bmw.c b/board/bmw/bmw.c
index 41ce14f653d74343412f270bc2edc2a0cd4412c4..5ba6c09d1ca00121140990b1ced9bb299e6e458a 100644 (file)
--- a/board/bmw/bmw.c
+++ b/board/bmw/bmw.c
@@ -21,12 +21,11 @@
  * MA 02111-1307 USA
  */
 
-#include <common.h>
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
 #include <malloc.h>
-#include <devices.h>
+#include <stdio_dev.h>
 #include <net.h>
 #include <timestamp.h>
 #include <dtt.h>
@@ -117,6 +116,7 @@ sys_led_msg(char* msg)
     LED_REG(3) = msg[0];
 }
 
+#ifdef CONFIG_CMD_DOC
 /*
  * Map onboard TSOP-16MB DOC FLASH chip.
  */
@@ -124,6 +124,7 @@ void doc_init (void)
 {
     doc_probe(DOC_BASE_ADDR);
 }
+#endif
 
 #define NV_ADDR        ((volatile unsigned char *) CONFIG_ENV_ADDR)