diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:10:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:10:25 -0400 |
| commit | f165eb77f49cb6f6e86e2f2f09183904b2965d19 (patch) | |
| tree | db166579758930f52a1a625eb872bd96bd7ff88e /arch/arm/mach-pxa/pxa27x.c | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
| parent | a6cd7eb374647b572ae9e7dbfe49871e6996e8e0 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmtreo.c
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index c059dac02b61..12e5b9f01e6f 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
| @@ -383,6 +383,7 @@ void __init pxa27x_set_i2c_power_info(struct i2c_pxa_platform_data *info) | |||
| 383 | 383 | ||
| 384 | static struct platform_device *devices[] __initdata = { | 384 | static struct platform_device *devices[] __initdata = { |
| 385 | &pxa27x_device_udc, | 385 | &pxa27x_device_udc, |
| 386 | &pxa_device_pmu, | ||
| 386 | &pxa_device_i2s, | 387 | &pxa_device_i2s, |
| 387 | &sa1100_device_rtc, | 388 | &sa1100_device_rtc, |
| 388 | &pxa_device_rtc, | 389 | &pxa_device_rtc, |