diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2010-06-14 00:43:00 +0800 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-08-05 14:32:19 +0800 |
commit | 09a5358d1ed3e023313e551599bb547edfbf1cbf (patch) | |
tree | 73c0ceda221100f19e560aff0ff4866949f8cd13 /arch/arm/mach-pxa/pxa25x.c | |
parent | 1b84387ac12b42b09315c6c1d176588de4b2e46f (diff) | |
download | linux-09a5358d1ed3e023313e551599bb547edfbf1cbf.tar.bz2 |
[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/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 0b9ad30bfd51..de53f2e4aa39 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c @@ -322,6 +322,7 @@ void __init pxa26x_init_irq(void) static struct platform_device *pxa25x_devices[] __initdata = { &pxa25x_device_udc, + &pxa_device_pmu, &pxa_device_i2s, &sa1100_device_rtc, &pxa25x_device_ssp, |