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

[karo-tx-uboot.git] / include / stdio_dev.h

diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index 82ad463c10af3d8930df77f7f8d82ee5c70c4a5d..9451740e8be4a51071a8e6aa4c94f45d1815ded9 100644 (file)
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -99,15 +99,12 @@ struct list_head* stdio_get_list(void);
 struct stdio_dev* stdio_get_by_name(const char* name);
 struct stdio_dev* stdio_clone(struct stdio_dev *dev);
 
-#ifdef CONFIG_ARM_DCC_MULTI
+#ifdef CONFIG_ARM_DCC
 int drv_arm_dcc_init(void);
 #endif
 #ifdef CONFIG_LCD
 int    drv_lcd_init (void);
 #endif
-#ifdef CONFIG_VFD
-int    drv_vfd_init (void);
-#endif
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
 int    drv_video_init (void);
 #endif
@@ -123,5 +120,8 @@ int drv_nc_init (void);
 #ifdef CONFIG_JTAG_CONSOLE
 int drv_jtag_console_init (void);
 #endif
+#ifdef CONFIG_CBMEM_CONSOLE
+int cbmemc_init(void);
+#endif
 
 #endif