diff options
| author | Tom Rini <trini@ti.com> | 2014-10-06 15:49:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-06 15:49:50 -0400 |
| commit | 8a6b088aff969a125cf4ed21f7608112f8b722e5 (patch) | |
| tree | 347fdd557fbd93bc1f9bcee4e1da492bfbfecc74 /include | |
| parent | 04de09f89bbc647d5b72db3512d1af1475a13bbd (diff) | |
| parent | e2140588dd2f3e619f21d9575281b7c7ea771c09 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/siemens-am33x-common.h | 2 | ||||
| -rw-r--r-- | include/stdio_dev.h | 4 | ||||
| -rw-r--r-- | include/usb.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index bf9752f874..1ce0965912 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -231,7 +231,7 @@ #define CONFIG_MUSB_GADGET #define CONFIG_MUSB_PIO_ONLY #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT -#define CONFIG_USB_GADGET_DUALSPEED +#undef CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_MUSB_HOST diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 268de8ea70..24da23fe50 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -103,8 +103,8 @@ int stdio_init(void); void stdio_print_current_devices(void); #ifdef CONFIG_SYS_STDIO_DEREGISTER -int stdio_deregister(const char *devname); -int stdio_deregister_dev(struct stdio_dev *dev); +int stdio_deregister(const char *devname, int force); +int stdio_deregister_dev(struct stdio_dev *dev, int force); #endif struct list_head* stdio_get_list(void); struct stdio_dev* stdio_get_by_name(const char* name); diff --git a/include/usb.h b/include/usb.h index d9fedeeff7..c355fbe481 100644 --- a/include/usb.h +++ b/include/usb.h @@ -216,7 +216,7 @@ int usb_host_eth_scan(int mode); #ifdef CONFIG_USB_KEYBOARD int drv_usb_kbd_init(void); -int usb_kbd_deregister(void); +int usb_kbd_deregister(int force); #endif /* routines */ |