summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-06-02 16:32:12 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-06-02 16:32:12 +0900
commit019e2574f965b800ba76f319d817eae9405ae064 (patch)
treefbcf7ade183a8dd4a6c55a2596cf5cf47bbb76d4 /drivers/input
parent4705b2e8047221142af2ed5e37f54ac4c7f80a7d (diff)
parent861160bfd097de7dbf3195bbef210e4f787327ab (diff)
Merge branch 'sh/iomap'
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index f34f1dbeb57..3bfe8fafc6a 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -21,7 +21,8 @@ if SERIO
config SERIO_I8042
tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
default y
- depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN
+ depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
+ (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
help
i8042 is the chip over which the standard AT keyboard and PS/2
mouse are connected to the computer. If you use these devices,