diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/arm/mach-pxa/hx4700.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
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, |