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

[oweals/u-boot.git] / include / configs / mp2usb.h

diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index edaa17403fbe18c0e15551736853b294300c43b2..ac678d0b608ea2fd56c1a956d651bad3b88909e5 100644 (file)
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -95,6 +95,7 @@
  */
 
 /* define one of these to choose the DBGU, USART0  or USART1 as console */
+#define CONFIG_AT91RM9200_USART
 #define CONFIG_DBGU
 #undef CONFIG_USART0
 #undef CONFIG_USART1
@@ -215,7 +216,7 @@
 #define CONFIG_SYS_MAXARGS             32              /* max number of command args */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 
-#define CONFIG_SYS_DEVICE_DEREGISTER           /* needs device_deregister */
+#define CONFIG_SYS_STDIO_DEREGISTER           /* needs stdio_deregister */
 
 #define CONFIG_SYS_HZ 1000
 #define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK/2)     /* AT91C_TC0_CMR is implicitly set to */