diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 14:38:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 14:38:37 -0400 |
| commit | 48f286a28fe13fcbc510720fcffb872a184b51dd (patch) | |
| tree | f50d868589138628c04dd5600a029ef80fa21da2 /arch/arm | |
| parent | ea431793f198e26d1553f36ed8b5a830b531eee4 (diff) | |
| parent | fa15ce8ad59e9653d50b8596596cb02d3566d4aa (diff) | |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd:
mfd: fix da903x warning
mfd: fix MAINTAINERS entry
mfd: Use the value of the final spin when reading the AUXADC
mfd: Storage class should be before const qualifier
mfd: PASIC3: supply clock_rate to DS1WM via driver_data
mfd: remove DS1WM clock handling
mfd: remove unused PASIC3 bus_shift field
pxa/magician: remove deprecated .bus_shift from PASIC3 platform_data
mfd: convert PASIC3 to use MFD core
mfd: convert DS1WM to use MFD core
mfd: Support active high IRQs on WM835x
mfd: Use bulk read to fill WM8350 register cache
mfd: remove duplicated #include from pcf50633
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-pxa/magician.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index d46b36746be2..deeea1c2782b 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
| @@ -507,7 +507,6 @@ static struct resource pasic3_resources[] = { | |||
| 507 | }; | 507 | }; |
| 508 | 508 | ||
| 509 | static struct pasic3_platform_data pasic3_platform_data = { | 509 | static struct pasic3_platform_data pasic3_platform_data = { |
| 510 | .bus_shift = 2, | ||
| 511 | .led_pdata = &pasic3_leds_info, | 510 | .led_pdata = &pasic3_leds_info, |
| 512 | .clock_rate = 4000000, | 511 | .clock_rate = 4000000, |
| 513 | }; | 512 | }; |