summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-02-25 07:40:34 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-02-28 09:37:10 +0100
commit832a998190400563a69677b30d5f306e45cc3aff (patch)
tree8cdc74516525651b639ef9c50e727f662f5afdc2
parentdb7760ad9b43bfc1ec4baeb7011142cbe069e8f8 (diff)
downloadop-kernel-dev-832a998190400563a69677b30d5f306e45cc3aff.zip
op-kernel-dev-832a998190400563a69677b30d5f306e45cc3aff.tar.gz
input: disable i8042 PC Keyboard controller for s390
Just add s390 to the list of architectures that don't want this driver. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--drivers/input/serio/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 6e9cc76..3ec5ef2 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -22,7 +22,7 @@ config SERIO_I8042
tristate "i8042 PC Keyboard controller" if EXPERT || !X86
default y
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
- (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN
+ (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390
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,
OpenPOWER on IntegriCloud