Commit bcd26230 authored by Tom Gundersen's avatar Tom Gundersen Committed by Dmitry Torokhov

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: default avatarTom Gundersen <teg@jklm.no>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 78551277
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Input core configuration # Input core configuration
# #
menuconfig INPUT_KEYBOARD menuconfig INPUT_KEYBOARD
bool "Keyboards" if EXPERT || !X86 bool "Keyboards"
default y default y
help help
Say Y here, and a list of supported keyboards will be displayed. Say Y here, and a list of supported keyboards will be displayed.
...@@ -67,7 +67,7 @@ config KEYBOARD_ATARI ...@@ -67,7 +67,7 @@ config KEYBOARD_ATARI
module will be called atakbd. module will be called atakbd.
config KEYBOARD_ATKBD config KEYBOARD_ATKBD
tristate "AT keyboard" if EXPERT || !X86 tristate "AT keyboard"
default y default y
select SERIO select SERIO
select SERIO_LIBPS2 select SERIO_LIBPS2
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Input core configuration # Input core configuration
# #
config SERIO config SERIO
tristate "Serial I/O support" if EXPERT || !X86 tristate "Serial I/O support"
default y default y
help help
Say Yes here if you have any input device that uses serial I/O to Say Yes here if you have any input device that uses serial I/O to
...@@ -19,7 +19,7 @@ config SERIO ...@@ -19,7 +19,7 @@ config SERIO
if SERIO if SERIO
config SERIO_I8042 config SERIO_I8042
tristate "i8042 PC Keyboard controller" if EXPERT || !X86 tristate "i8042 PC Keyboard controller"
default y default y
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
(!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \ (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \
...@@ -170,7 +170,7 @@ config SERIO_MACEPS2 ...@@ -170,7 +170,7 @@ config SERIO_MACEPS2
module will be called maceps2. module will be called maceps2.
config SERIO_LIBPS2 config SERIO_LIBPS2
tristate "PS/2 driver library" if EXPERT tristate "PS/2 driver library"
depends on SERIO_I8042 || SERIO_I8042=n depends on SERIO_I8042 || SERIO_I8042=n
help help
Say Y here if you are using a driver for device connected Say Y here if you are using a driver for device connected
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment