usb_kbd: fix usb_kbd_deregister when DEVICE_DEREGISTER not enable

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Remy Böhmer <linux@bohmer.net>

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index cf14560955765c6f65701ec68c42d5954a2ac0d9..89e6ee7e5d103a20bfe2132c0869e1fae2d9fbc6 100644 (file)
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -211,7 +211,11 @@ int drv_usb_kbd_init(void)
 /* deregistering the keyboard */
 int usb_kbd_deregister(void)
 {
+#ifdef CONFIG_SYS_DEVICE_DEREGISTER
        return device_deregister(DEVNAME);
+#else
+       return 1;
+#endif
 }
 
 /**************************************************************************

diff --git a/include/devices.h b/include/devices.h
index 6b78d5888942faccf2c511fbd6724bcb60e9df27..20ddfc43427b205adc8865744ab69ed4826f458b 100644 (file)
--- a/include/devices.h
+++ b/include/devices.h
@@ -91,7 +91,9 @@ extern char *stdio_names[MAX_FILES];
  */
 int    device_register (device_t * dev);
 int    devices_init (void);
+#ifdef CONFIG_SYS_DEVICE_DEREGISTER
 int    device_deregister(char *devname);
+#endif
 struct list_head* device_get_list(void);
 device_t* device_get_by_name(char* name);
 device_t* device_clone(device_t *dev);