diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 15:54:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 16:01:40 -0400 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/arm/mach-pxa/spitz.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index f9dc59c054b3..ee8d6038ce82 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
| @@ -423,6 +423,7 @@ static struct ads7846_platform_data spitz_ads7846_info = { | |||
| 423 | .vref_delay_usecs = 100, | 423 | .vref_delay_usecs = 100, |
| 424 | .x_plate_ohms = 419, | 424 | .x_plate_ohms = 419, |
| 425 | .y_plate_ohms = 486, | 425 | .y_plate_ohms = 486, |
| 426 | .pressure_max = 1024, | ||
| 426 | .gpio_pendown = SPITZ_GPIO_TP_INT, | 427 | .gpio_pendown = SPITZ_GPIO_TP_INT, |
| 427 | .wait_for_sync = spitz_wait_for_hsync, | 428 | .wait_for_sync = spitz_wait_for_hsync, |
| 428 | }; | 429 | }; |