diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2006-10-09 16:22:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 17:54:45 -0400 |
| commit | da96d0b58adddf3bdeaa9644ac74f0dcc9039407 (patch) | |
| tree | 47fe66ac09941370dfcc157ef3525f63c9212f06 | |
| parent | 6fb8296aa1681e74b2aa3c59169d9014e6a0dfc3 (diff) | |
[PATCH] m68k/HP300: Enable HIL configuration options
Enable HIL configuration options on HP300
Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/input/keyboard/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/input/misc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/mouse/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/serio/Kconfig | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 679bde34d247..81a333f73010 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
| @@ -166,7 +166,7 @@ config KEYBOARD_AMIGA | |||
| 166 | 166 | ||
| 167 | config KEYBOARD_HIL_OLD | 167 | config KEYBOARD_HIL_OLD |
| 168 | tristate "HP HIL keyboard support (simple driver)" | 168 | tristate "HP HIL keyboard support (simple driver)" |
| 169 | depends on GSC | 169 | depends on GSC || HP300 |
| 170 | default y | 170 | default y |
| 171 | help | 171 | help |
| 172 | The "Human Interface Loop" is a older, 8-channel USB-like | 172 | The "Human Interface Loop" is a older, 8-channel USB-like |
| @@ -183,7 +183,7 @@ config KEYBOARD_HIL_OLD | |||
| 183 | 183 | ||
| 184 | config KEYBOARD_HIL | 184 | config KEYBOARD_HIL |
| 185 | tristate "HP HIL keyboard support" | 185 | tristate "HP HIL keyboard support" |
| 186 | depends on GSC | 186 | depends on GSC || HP300 |
| 187 | default y | 187 | default y |
| 188 | select HP_SDC | 188 | select HP_SDC |
| 189 | select HIL_MLC | 189 | select HIL_MLC |
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index a6dfc7455733..ba0e88c64e1e 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig | |||
| @@ -73,7 +73,7 @@ config INPUT_UINPUT | |||
| 73 | 73 | ||
| 74 | config HP_SDC_RTC | 74 | config HP_SDC_RTC |
| 75 | tristate "HP SDC Real Time Clock" | 75 | tristate "HP SDC Real Time Clock" |
| 76 | depends on GSC | 76 | depends on GSC || HP300 |
| 77 | select HP_SDC | 77 | select HP_SDC |
| 78 | help | 78 | help |
| 79 | Say Y here if you want to support the built-in real time clock | 79 | Say Y here if you want to support the built-in real time clock |
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index f15ccf781688..35d998c3e578 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig | |||
| @@ -119,7 +119,7 @@ config MOUSE_VSXXXAA | |||
| 119 | 119 | ||
| 120 | config MOUSE_HIL | 120 | config MOUSE_HIL |
| 121 | tristate "HIL pointers (mice etc)." | 121 | tristate "HIL pointers (mice etc)." |
| 122 | depends on GSC | 122 | depends on GSC || HP300 |
| 123 | select HP_SDC | 123 | select HP_SDC |
| 124 | select HIL_MLC | 124 | select HIL_MLC |
| 125 | help | 125 | help |
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 |