summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-12-02 21:58:04 +0100
committerRemy Bohmer <linux@bohmer.net>2008-12-20 11:03:01 +0100
commitfea91edee8ae0295e3c30b1ff544df51f4d668e1 (patch)
treecdc32e68b48ee6c0566562cdc06f7cc7a17192da /common
parentaced78d852d0b009e8aaa1445af8cb40861ee549 (diff)
downloadu-boot-fea91edee8ae0295e3c30b1ff544df51f4d668e1.tar.gz
u-boot-fea91edee8ae0295e3c30b1ff544df51f4d668e1.tar.xz
u-boot-fea91edee8ae0295e3c30b1ff544df51f4d668e1.zip
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>
Diffstat (limited to 'common')
-rw-r--r--common/usb_kbd.c4
1 files changed, 4 insertions, 0 deletions
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
}
/**************************************************************************