diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 09:32:12 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 09:32:12 +0200 |
commit | 019e2574f965b800ba76f319d817eae9405ae064 (patch) | |
tree | fbcf7ade183a8dd4a6c55a2596cf5cf47bbb76d4 /drivers/input | |
parent | sh: add romImage MMCIF boot for sh7724 and Ecovec V2 (diff) | |
parent | sh: PIO disabling for x3proto and urquell. (diff) | |
download | linux-019e2574f965b800ba76f319d817eae9405ae064.tar.xz linux-019e2574f965b800ba76f319d817eae9405ae064.zip |
Merge branch 'sh/iomap'
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/serio/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index f34f1dbeb577..3bfe8fafc6ad 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, |