projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-usb
[platform/kernel/u-boot.git]
/
common
/
usb_kbd.c
diff --git
a/common/usb_kbd.c
b/common/usb_kbd.c
index
d84865f
..
97f79f8
100644
(file)
--- a/
common/usb_kbd.c
+++ b/
common/usb_kbd.c
@@
-566,7
+566,6
@@
int drv_usb_kbd_init(void)
/* No USB Keyboard found */
return -1;
}
-#endif
/* Deregister the keyboard. */
int usb_kbd_deregister(int force)
@@
-599,6
+598,8
@@
int usb_kbd_deregister(int force)
#endif
}
+#endif
+
#ifdef CONFIG_DM_USB
static int usb_kbd_probe(struct udevice *dev)