diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/arm/mach-pxa/hx4700.c | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
Diffstat (limited to 'arch/arm/mach-pxa/hx4700.c')
| -rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index abff9e132749..83bd3c6e3884 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c | |||
| @@ -604,7 +604,7 @@ static struct platform_device gpio_vbus = { | |||
| 604 | static const struct ads7846_platform_data tsc2046_info = { | 604 | static const struct ads7846_platform_data tsc2046_info = { |
| 605 | .model = 7846, | 605 | .model = 7846, |
| 606 | .vref_delay_usecs = 100, | 606 | .vref_delay_usecs = 100, |
| 607 | .pressure_max = 512, | 607 | .pressure_max = 1024, |
| 608 | .debounce_max = 10, | 608 | .debounce_max = 10, |
| 609 | .debounce_tol = 3, | 609 | .debounce_tol = 3, |
| 610 | .debounce_rep = 1, | 610 | .debounce_rep = 1, |