diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2010-06-13 12:43:00 -0400 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-08-05 02:32:19 -0400 |
| commit | 09a5358d1ed3e023313e551599bb547edfbf1cbf (patch) | |
| tree | 73c0ceda221100f19e560aff0ff4866949f8cd13 /arch/arm/mach-pxa/pxa3xx.c | |
| parent | 1b84387ac12b42b09315c6c1d176588de4b2e46f (diff) | |
[ARM] pxa: move pmu device back into mach-pxa/
Not tested and enabled on MMP at this moment, and since the IRQ
is different from mach-pxa, I'd prefer to move the PMU device
back into mach-pxa/. Will introduce the PMU device to MMP once
it's enabled and tested.
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index c18d2dfa3faf..acfa9f72657b 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
| @@ -608,6 +608,7 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info) | |||
| 608 | 608 | ||
| 609 | static struct platform_device *devices[] __initdata = { | 609 | static struct platform_device *devices[] __initdata = { |
| 610 | &pxa27x_device_udc, | 610 | &pxa27x_device_udc, |
| 611 | &pxa_device_pmu, | ||
| 611 | &pxa_device_i2s, | 612 | &pxa_device_i2s, |
| 612 | &sa1100_device_rtc, | 613 | &sa1100_device_rtc, |
| 613 | &pxa_device_rtc, | 614 | &pxa_device_rtc, |