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 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
drivers
/
input
/
i8042.c
diff --git
a/drivers/input/i8042.c
b/drivers/input/i8042.c
index
22c2a4e
..
d152768
100644
(file)
--- a/
drivers/input/i8042.c
+++ b/
drivers/input/i8042.c
@@
-27,8
+27,6
@@
#include <common.h>
-#ifdef CONFIG_I8042_KBD
-
#ifdef CONFIG_USE_CPCIDVI
extern u8 gt_cpcidvi_in8(u32 offset);
extern void gt_cpcidvi_out8(u32 offset, u8 data);
@@
-670,5
+668,3
@@
static int kbd_reset (void)
return 0;
}
-
-#endif /* CONFIG_I8042_KBD */