diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-06 19:56:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-06 19:56:03 -0400 |
| commit | ae27120c31d58b8bb694d9155bcffdcfae8552a6 (patch) | |
| tree | 8fcd4823406dc3adfb82174314198e9396c24feb /common/cmd_usb.c | |
| parent | f05fa6781ae1122f348e66b5b26acbfe552f6602 (diff) | |
| parent | fac971b2b5efbdb6ed2d12ebdbf7e029c5ed30e8 (diff) | |
| download | u-boot-ae27120c31d58b8bb694d9155bcffdcfae8552a6.tar.gz u-boot-ae27120c31d58b8bb694d9155bcffdcfae8552a6.tar.xz u-boot-ae27120c31d58b8bb694d9155bcffdcfae8552a6.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/cmd_usb.c')
| -rw-r--r-- | common/cmd_usb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 0ade7759f0..6874af7547 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -530,13 +530,16 @@ static void do_usb_start(void) /* try to recognize storage devices immediately */ usb_stor_curr_dev = usb_stor_scan(1); #endif +#endif #ifdef CONFIG_USB_HOST_ETHER # ifdef CONFIG_DM_ETH -# error "You must use CONFIG_DM_USB if you want to use CONFIG_USB_HOST_ETHER with CONFIG_DM_ETH" -# endif +# ifndef CONFIG_DM_USB +# error "You must use CONFIG_DM_USB if you want to use CONFIG_USB_HOST_ETHER with CONFIG_DM_ETH" +# endif +# else /* try to recognize ethernet devices immediately */ usb_ether_curr_dev = usb_host_eth_scan(1); -#endif +# endif #endif #ifdef CONFIG_USB_KEYBOARD drv_usb_kbd_init(); |