summaryrefslogtreecommitdiffstats
path: root/include/usb.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-10-11 01:20:30 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-10-11 01:20:30 +0200
commit790af815436bc6a93e4c581840be2419897f23b1 (patch)
tree1ba0aaacad86092aea67d3612ae066b33b117619 /include/usb.h
parentd0b3723034aa865b8618428739efe1d98b1a2e2b (diff)
parentdb67801bf92f7fae6131dbc0d387131698fb9490 (diff)
downloadblackbird-obmc-uboot-790af815436bc6a93e4c581840be2419897f23b1.tar.gz
blackbird-obmc-uboot-790af815436bc6a93e4c581840be2419897f23b1.zip
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/usb.h')
-rw-r--r--include/usb.h2
1 files changed, 1 insertions, 1 deletions
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 */
OpenPOWER on IntegriCloud