diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 03:32:12 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 03:32:12 -0400 |
| commit | 019e2574f965b800ba76f319d817eae9405ae064 (patch) | |
| tree | fbcf7ade183a8dd4a6c55a2596cf5cf47bbb76d4 /drivers/input | |
| parent | 4705b2e8047221142af2ed5e37f54ac4c7f80a7d (diff) | |
| parent | 861160bfd097de7dbf3195bbef210e4f787327ab (diff) | |
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 f34f1dbeb57..3bfe8fafc6a 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
| @@ -21,7 +21,8 @@ if SERIO | |||
| 21 | config SERIO_I8042 | 21 | config SERIO_I8042 |
| 22 | tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 | 22 | tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 |
| 23 | default y | 23 | default y |
| 24 | depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN | 24 | depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ |
| 25 | (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN | ||
| 25 | help | 26 | help |
| 26 | i8042 is the chip over which the standard AT keyboard and PS/2 | 27 | i8042 is the chip over which the standard AT keyboard and PS/2 |
| 27 | mouse are connected to the computer. If you use these devices, | 28 | mouse are connected to the computer. If you use these devices, |