Skip to content

Commit

Permalink
Input: allow deselecting serio drivers even without CONFIG_EXPERT
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tom Gundersen authored and Dmitry Torokhov committed Oct 31, 2013
1 parent 7855127 commit bcd2623
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/input/keyboard/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions drivers/input/serio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Input core configuration
#
config SERIO
tristate "Serial I/O support" if EXPERT || !X86
tristate "Serial I/O support"
default y
help
Say Yes here if you have any input device that uses serial I/O to
Expand All @@ -19,7 +19,7 @@ config SERIO
if SERIO

config SERIO_I8042
tristate "i8042 PC Keyboard controller" if EXPERT || !X86
tristate "i8042 PC Keyboard controller"
default y
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \
(!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \
Expand Down Expand Up @@ -170,7 +170,7 @@ config SERIO_MACEPS2
module will be called maceps2.

config SERIO_LIBPS2
tristate "PS/2 driver library" if EXPERT
tristate "PS/2 driver library"
depends on SERIO_I8042 || SERIO_I8042=n
help
Say Y here if you are using a driver for device connected
Expand Down

0 comments on commit bcd2623

Please sign in to comment.