diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-17 15:26:03 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-17 15:26:03 (GMT) |
| commit | 373ae16c9282cf6dfb39cd6e1b8ad26098635ca2 (patch) | |
| tree | c563331cc0b91eaefe5985ae0f560add51b79d93 /cmd/usb.c | |
| parent | f253f2933b7373556329c0174dd5b101039a4056 (diff) | |
| parent | 65c389d27902f6376bd057609b66b7339b219cf1 (diff) | |
| download | u-boot-fsl-qoriq-373ae16c9282cf6dfb39cd6e1b8ad26098635ca2.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'cmd/usb.c')
| -rw-r--r-- | cmd/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -571,11 +571,11 @@ static void do_usb_start(void) return; /* Driver model will probe the devices as they are found */ -#ifndef CONFIG_DM_USB # ifdef CONFIG_USB_STORAGE /* try to recognize storage devices immediately */ usb_stor_curr_dev = usb_stor_scan(1); # endif +#ifndef CONFIG_DM_USB # ifdef CONFIG_USB_KEYBOARD drv_usb_kbd_init(); # endif |