diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /drivers/input/serio/Kconfig | |
| parent | 53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/input/serio/Kconfig')
| -rw-r--r-- | drivers/input/serio/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 8cdbfeca5903..adef447f23ea 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
| @@ -112,7 +112,7 @@ config SERIO_GSCPS2 | |||
| 112 | 112 | ||
| 113 | config HP_SDC | 113 | config HP_SDC |
| 114 | tristate "HP System Device Controller i8042 Support" | 114 | tristate "HP System Device Controller i8042 Support" |
| 115 | depends on GSC && SERIO | 115 | depends on (GSC || HP300) && SERIO |
| 116 | default y | 116 | default y |
| 117 | ---help--- | 117 | ---help--- |
| 118 | This option enables support for the "System Device | 118 | This option enables support for the "System Device |