diff options
| author | Tom Gundersen <teg@jklm.no> | 2013-10-31 03:38:30 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-12 01:36:28 -0500 |
| commit | 4cdd9497f6ece54905d1df1d793b136c79123b09 (patch) | |
| tree | bbc7e2ab4d81fc6e8fec7d0c71f9e5dd8ef92f0d /drivers/input/keyboard | |
| parent | 2e8cb3339b9e52c4d8dcaca913412ebab5dae271 (diff) | |
Input: allow deselecting serio drivers even without CONFIG_EXPERT
commit bcd2623073e98f69f84720308db0b142c4da0bd6 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/keyboard')
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 7ac9c9818d55..292f3240e67b 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Input core configuration | 2 | # Input core configuration |
| 3 | # | 3 | # |
| 4 | menuconfig INPUT_KEYBOARD | 4 | menuconfig INPUT_KEYBOARD |
| 5 | bool "Keyboards" if EXPERT || !X86 | 5 | bool "Keyboards" |
| 6 | default y | 6 | default y |
| 7 | help | 7 | help |
| 8 | Say Y here, and a list of supported keyboards will be displayed. | 8 | Say Y here, and a list of supported keyboards will be displayed. |
| @@ -67,7 +67,7 @@ config KEYBOARD_ATARI | |||
| 67 | module will be called atakbd. | 67 | module will be called atakbd. |
| 68 | 68 | ||
| 69 | config KEYBOARD_ATKBD | 69 | config KEYBOARD_ATKBD |
| 70 | tristate "AT keyboard" if EXPERT || !X86 | 70 | tristate "AT keyboard" |
| 71 | default y | 71 | default y |
| 72 | select SERIO | 72 | select SERIO |
| 73 | select SERIO_LIBPS2 | 73 | select SERIO_LIBPS2 |
