Re: [patch] 2.6.0-test5: serio config broken?

Adrian Bunk
2003-09-10T19:55:57Z

On Wed, Sep 10, 2003 at 12:31:58PM -0700, Tom Rini wrote:
>...
> ===== drivers/input/keyboard/Kconfig 1.6 vs edited =====
> --- 1.6/drivers/input/keyboard/Kconfig Wed Jul 16 10:39:32 2003
> +++ edited/drivers/input/keyboard/Kconfig Fri Sep 5 14:45:36 2003
> @@ -2,8 +2,9 @@
> # Input core configuration
> #
> config INPUT_KEYBOARD
> - bool "Keyboards" if EMBEDDED || !X86
> + bool "Keyboards"
> default y
> + select KEYBOARD_ATKBD if STANDARD && X86
> depends on INPUT
> help
> Say Y here, and a list of supported keyboards will be displayed.
> @@ -12,7 +13,7 @@
> If unsure, say Y.
>
> config KEYBOARD_ATKBD
> - tristate "AT keyboard support" if EMBEDDED || !X86
> + tristate "AT keyboard support"
> default y
> depends on INPUT && INPUT_KEYBOARD && SERIO
> help
> ===== drivers/input/serio/Kconfig 1.9 vs edited =====
> --- 1.9/drivers/input/serio/Kconfig Wed Jul 16 10:39:32 2003
> +++ edited/drivers/input/serio/Kconfig Fri Sep 5 14:45:36 2003
> @@ -2,7 +2,8 @@
> # Input core configuration
> #
> config SERIO
> - tristate "Serial i/o support (needed for keyboard and mouse)"
> + tristate "Serial i/o support (needed for keyboard and mouse)" if !(STANDARD && X86)
> + select SERIO_I8042 if STANDARD && X86
> default y
> ---help---
> Say Yes here if you have any input device that uses serial I/O to

This works but seems fragile since everyone touching the dependencies
must know that the tristate dependencies of SERIO must always match the
select dependencies in INPUT_KEYBOARD.

> @@ -19,7 +20,7 @@
> as a module, say M here and read <file:Documentation/modules.txt>.
>
> config SERIO_I8042
> - tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
> + tristate "i8042 PC Keyboard controller"
> default y
> depends on SERIO
> ---help---
>...

Yes, removing the "if EMBEDDED || !X86" solves the problem...

> Tom Rini

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed