diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-01-17 01:14:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-17 02:15:27 -0500 |
| commit | 0025835cf20e07056b8521b8c1d7d0bfe07e81f1 (patch) | |
| tree | af60b66554b531fb93f591649014e3641427abf4 /drivers | |
| parent | 5ebdce726baf17eb66c5a1bf402ae6f161a082ed (diff) | |
[PATCH] sh: consolidate hp620/hp680/hp690 targets into hp6xx
Most of the reasons for keeping these separate before was due to hp690
discontig, and since we have a workaround for that now (abusing some shadow
space so everything is magically contiguous), there's no reason to keep the
targets separate.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 2c674023a6a..b1b14f8d4dd 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
| @@ -98,7 +98,7 @@ config TOUCHSCREEN_MK712 | |||
| 98 | 98 | ||
| 99 | config TOUCHSCREEN_HP600 | 99 | config TOUCHSCREEN_HP600 |
| 100 | tristate "HP Jornada 680/690 touchscreen" | 100 | tristate "HP Jornada 680/690 touchscreen" |
| 101 | depends on SH_HP600 && SH_ADC | 101 | depends on SH_HP6XX && SH_ADC |
| 102 | help | 102 | help |
| 103 | Say Y here if you have a HP Jornada 680 or 690 and want to | 103 | Say Y here if you have a HP Jornada 680 or 690 and want to |
| 104 | support the built-in touchscreen. | 104 | support the built-in touchscreen. |