diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /drivers/input/touchscreen | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'drivers/input/touchscreen')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/touchscreen/hp680_ts_input.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index dff4adca647..3d1ab8fa9ac 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
| @@ -223,7 +223,7 @@ config TOUCHSCREEN_ATMEL_TSADCC | |||
| 223 | 223 | ||
| 224 | config TOUCHSCREEN_UCB1400 | 224 | config TOUCHSCREEN_UCB1400 |
| 225 | tristate "Philips UCB1400 touchscreen" | 225 | tristate "Philips UCB1400 touchscreen" |
| 226 | select AC97_BUS | 226 | depends on AC97_BUS |
| 227 | depends on UCB1400_CORE | 227 | depends on UCB1400_CORE |
| 228 | help | 228 | help |
| 229 | This enables support for the Philips UCB1400 touchscreen interface. | 229 | This enables support for the Philips UCB1400 touchscreen interface. |
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c index c38d4e0f95c..a89700e7ace 100644 --- a/drivers/input/touchscreen/hp680_ts_input.c +++ b/drivers/input/touchscreen/hp680_ts_input.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <asm/io.h> | 5 | #include <asm/io.h> |
| 6 | #include <asm/delay.h> | 6 | #include <asm/delay.h> |
| 7 | #include <asm/adc.h> | 7 | #include <asm/adc.h> |
| 8 | #include <asm/hp6xx.h> | 8 | #include <mach/hp6xx.h> |
| 9 | 9 | ||
| 10 | #define MODNAME "hp680_ts_input" | 10 | #define MODNAME "hp680_ts_input" |
| 11 | 11 | ||