diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-12-30 23:22:19 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-30 23:22:19 +0100 |
| commit | b3a974d005820534b5b9a5f65f110f63650ec387 (patch) | |
| tree | 094862845faf79054a71243880f7a56e9f718620 | |
| parent | 0668236bafaa1c11c521652a2facebc74beecbf0 (diff) | |
| parent | fea91edee8ae0295e3c30b1ff544df51f4d668e1 (diff) | |
| download | u-boot-imx-b3a974d005820534b5b9a5f65f110f63650ec387.zip u-boot-imx-b3a974d005820534b5b9a5f65f110f63650ec387.tar.gz u-boot-imx-b3a974d005820534b5b9a5f65f110f63650ec387.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
| -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); |