diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
| commit | 7e1548a597ef7e26d5d62f8be3be6da9e101b26c (patch) | |
| tree | fe6cbf4d9a3c1afdba04fb276fef0f932403727c /arch/arm/mach-omap1/board-palmtt.c | |
| parent | 1f7f569c0ae6e619504095eabf796edd712d943d (diff) | |
| parent | 2619bc327417f549f1c89d5ef9b4a4aa768f41a2 (diff) | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'arch/arm/mach-omap1/board-palmtt.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-palmtt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index 40f9860a09df..5c001afe8062 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c | |||
| @@ -268,7 +268,7 @@ static struct platform_device *palmtt_devices[] __initdata = { | |||
| 268 | 268 | ||
| 269 | static int palmtt_get_pendown_state(void) | 269 | static int palmtt_get_pendown_state(void) |
| 270 | { | 270 | { |
| 271 | return !omap_get_gpio_datain(6); | 271 | return !gpio_get_value(6); |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | static const struct ads7846_platform_data palmtt_ts_info = { | 274 | static const struct ads7846_platform_data palmtt_ts_info = { |