Commit bcd2623073e98f69f84720308db0b142c4da0bd6
Committed by
Dmitry Torokhov
Dmitry Torokhov
1 parent
78551277e4
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
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>
Showing 2 changed files with 5 additions and 5 deletions Side-by-side Diff
drivers/input/keyboard/Kconfig
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | # Input core configuration |
| 3 | 3 | # |
| 4 | 4 | menuconfig INPUT_KEYBOARD |
| 5 | - bool "Keyboards" if EXPERT || !X86 | |
| 5 | + bool "Keyboards" | |
| 6 | 6 | default y |
| 7 | 7 | help |
| 8 | 8 | Say Y here, and a list of supported keyboards will be displayed. |
| ... | ... | @@ -67,7 +67,7 @@ |
| 67 | 67 | module will be called atakbd. |
| 68 | 68 | |
| 69 | 69 | config KEYBOARD_ATKBD |
| 70 | - tristate "AT keyboard" if EXPERT || !X86 | |
| 70 | + tristate "AT keyboard" | |
| 71 | 71 | default y |
| 72 | 72 | select SERIO |
| 73 | 73 | select SERIO_LIBPS2 |
drivers/input/serio/Kconfig
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | # Input core configuration |
| 3 | 3 | # |
| 4 | 4 | config SERIO |
| 5 | - tristate "Serial I/O support" if EXPERT || !X86 | |
| 5 | + tristate "Serial I/O support" | |
| 6 | 6 | default y |
| 7 | 7 | help |
| 8 | 8 | Say Yes here if you have any input device that uses serial I/O to |
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | if SERIO |
| 20 | 20 | |
| 21 | 21 | config SERIO_I8042 |
| 22 | - tristate "i8042 PC Keyboard controller" if EXPERT || !X86 | |
| 22 | + tristate "i8042 PC Keyboard controller" | |
| 23 | 23 | default y |
| 24 | 24 | depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ |
| 25 | 25 | (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN && !S390 && \ |
| ... | ... | @@ -170,7 +170,7 @@ |
| 170 | 170 | module will be called maceps2. |
| 171 | 171 | |
| 172 | 172 | config SERIO_LIBPS2 |
| 173 | - tristate "PS/2 driver library" if EXPERT | |
| 173 | + tristate "PS/2 driver library" | |
| 174 | 174 | depends on SERIO_I8042 || SERIO_I8042=n |
| 175 | 175 | help |
| 176 | 176 | Say Y here if you are using a driver for device connected |