diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 05:35:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-05 05:35:33 -0500 |
| commit | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch) | |
| tree | 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /arch/arm/mach-pxa/pxa27x.c | |
| parent | e28edb723e64200554194da17617ee6e82de6690 (diff) | |
| parent | 677f4f64e4b2336682f0e15c69b206ade6f6b131 (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index ec68cc16b4e3..6a0b73167e03 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
| @@ -364,9 +364,6 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) | |||
| 364 | 364 | ||
| 365 | static struct platform_device *devices[] __initdata = { | 365 | static struct platform_device *devices[] __initdata = { |
| 366 | &pxa27x_device_udc, | 366 | &pxa27x_device_udc, |
| 367 | &pxa_device_ffuart, | ||
| 368 | &pxa_device_btuart, | ||
| 369 | &pxa_device_stuart, | ||
| 370 | &pxa_device_i2s, | 367 | &pxa_device_i2s, |
| 371 | &sa1100_device_rtc, | 368 | &sa1100_device_rtc, |
| 372 | &pxa_device_rtc, | 369 | &pxa_device_rtc, |