projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d4526b
)
f_thor: add missing ifdef for lcd menu
author
Przemyslaw Marczak
<p.marczak@samsung.com>
Fri, 13 Jun 2014 16:43:10 +0000
(18:43 +0200)
committer
Lukasz Majewski
<l.majewski@samsung.com>
Thu, 30 Oct 2014 08:27:15 +0000
(09:27 +0100)
Change-Id: I13d0981ea07dcacdaef40aa0297db054694468ca
Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
drivers/usb/gadget/f_thor.c
patch
|
blob
|
history
diff --git
a/drivers/usb/gadget/f_thor.c
b/drivers/usb/gadget/f_thor.c
index
54dd17c
..
159434d
100644
(file)
--- a/
drivers/usb/gadget/f_thor.c
+++ b/
drivers/usb/gadget/f_thor.c
@@
-717,9
+717,9
@@
int thor_init(void)
debug("THOR enumeration/configuration setting....\n");
while (!dev->configuration_done) {
usb_gadget_handle_interrupts();
-
+#ifdef CONFIG_LCD_MENU
power_key_cnt += key_pressed(KEY_POWER);
-
+#endif
if (ctrlc() || power_key_cnt >= 3) {
#ifdef CONFIG_BOOT_INFORM
boot_inform_clear();