diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-12-02 21:58:04 +0100 |
|---|---|---|
| committer | Remy Bohmer <linux@bohmer.net> | 2008-12-20 11:03:01 +0100 |
| commit | fea91edee8ae0295e3c30b1ff544df51f4d668e1 (patch) | |
| tree | cdc32e68b48ee6c0566562cdc06f7cc7a17192da | |
| parent | aced78d852d0b009e8aaa1445af8cb40861ee549 (diff) | |
| download | u-boot-imx-fea91edee8ae0295e3c30b1ff544df51f4d668e1.zip u-boot-imx-fea91edee8ae0295e3c30b1ff544df51f4d668e1.tar.gz u-boot-imx-fea91edee8ae0295e3c30b1ff544df51f4d668e1.tar.bz2 | |
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>
| -rw-r--r-- | common/usb_kbd.c | 4 | ||||
| -rw-r--r-- | include/devices.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/common/usb_kbd.c b/common/usb_kbd.c index cf14560..89e6ee7 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 6b78d58..20ddfc4 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); |