Commit b3a974d0 authored by Wolfgang Denk's avatar Wolfgang Denk

Merge branch 'master' of git://git.denx.de/u-boot-usb

parents 0668236b fea91ede
......@@ -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
}
/**************************************************************************
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment