Merge branch 'testing' of git://www.denx.de/git/u-boot-fdt

[oweals/u-boot.git] / include / devices.h

diff --git a/include/devices.h b/include/devices.h
index b1e1ebdfd7d16b2427a1db1855b62209b8a9370e..2d9e282e38f16248bc8d3e465e0b3e651eece30d 100644 (file)
--- a/include/devices.h
+++ b/include/devices.h
@@ -35,11 +35,11 @@
 #define DEV_FLAGS_SYSTEM 0x80000000    /* Device is a system device            */
 #define DEV_EXT_VIDEO   0x00000001     /* Video extensions supported           */
 
-/* Device informations */
+/* Device information */
 typedef struct {
        int     flags;                  /* Device flags: input/output/system    */
        int     ext;                    /* Supported extensions                 */
-       char    name[8];                /* Device name                          */
+       char    name[16];               /* Device name                          */
 
 /* GENERAL functions */
 
@@ -99,11 +99,17 @@ int drv_lcd_init (void);
 #ifdef CONFIG_VFD
 int    drv_vfd_init (void);
 #endif
-#ifdef CONFIG_VIDEO
+#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
 int    drv_video_init (void);
 #endif
-#ifdef CONFIG_WL_4PPM_KEYBOARD
-int    drv_wlkbd_init (void);
+#ifdef CONFIG_KEYBOARD
+int    drv_keyboard_init (void);
+#endif
+#ifdef CONFIG_USB_TTY
+int    drv_usbtty_init (void);
+#endif
+#ifdef CONFIG_NETCONSOLE
+int    drv_nc_init (void);
 #endif
 
 #endif /* _DEVICES_H_ */