From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 2 Dec 2008 20:58:04 +0000 (+0100)
Subject: usb_kbd: fix usb_kbd_deregister when DEVICE_DEREGISTER not enable
X-Git-Tag: v2009.01-rc2~14^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fea91edee8ae0295e3c30b1ff544df51f4d668e1;p=u-boot

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 cf14560955..89e6ee7e5d 100644
--- 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 6b78d58889..20ddfc4342 100644
--- 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);