projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[cascardo/linux.git]
/
drivers
/
input
/
serio
/
i8042-io.h
diff --git
a/drivers/input/serio/i8042-io.h
b/drivers/input/serio/i8042-io.h
index
3b4e13b
..
f451c73
100644
(file)
--- a/
drivers/input/serio/i8042-io.h
+++ b/
drivers/input/serio/i8042-io.h
@@
-25,7
+25,7
@@
#elif defined(__arm__)
/* defined in include/asm-arm/arch-xxx/irqs.h */
#include <asm/irq.h>
-#elif defined(CONFIG_S
UPERH64
)
+#elif defined(CONFIG_S
H_CAYMAN
)
#include <asm/irq.h>
#else
# define I8042_KBD_IRQ 1