summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2013-10-31 00:38:30 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-10-31 08:46:06 -0700
commitbcd2623073e98f69f84720308db0b142c4da0bd6 (patch)
tree22641346921ad72af9b3ba67d2bfc52f95a27837 /drivers/input/keyboard
parent78551277e4df57864b0b0e7f85c23ede2be2edb8 (diff)
downloadlinux-bcd2623073e98f69f84720308db0b142c4da0bd6.tar.gz
linux-bcd2623073e98f69f84720308db0b142c4da0bd6.tar.bz2
linux-bcd2623073e98f69f84720308db0b142c4da0bd6.zip
Input: allow deselecting serio drivers even without CONFIG_EXPERT
There is plenty of consumer hardware (e.g., mac books) that does not use AT keyboards or PS/2 mice. It therefore makes sense for distro kernels to build the related drivers as modules to avoid loading them on hardware that does not need them. As such, these options should no longer be protected by EXPERT. Moreover, building these drivers as modules gets rid of the following ugly error during boot: [ 2.337745] i8042: PNP: No PS/2 controller found. Probing ports directly. [ 3.439537] i8042: No controller found Signed-off-by: Tom Gundersen <teg@jklm.no> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c1edd39bc5ba..1fa37e6d004e 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -2,7 +2,7 @@
# Input core configuration
#
menuconfig INPUT_KEYBOARD
- bool "Keyboards" if EXPERT || !X86
+ bool "Keyboards"
default y
help
Say Y here, and a list of supported keyboards will be displayed.
@@ -67,7 +67,7 @@ config KEYBOARD_ATARI
module will be called atakbd.
config KEYBOARD_ATKBD
- tristate "AT keyboard" if EXPERT || !X86
+ tristate "AT keyboard"
default y
select SERIO
select SERIO_LIBPS2