git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.36' into kbuild/misc
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa25x.c
diff --git
a/arch/arm/mach-pxa/pxa25x.c
b/arch/arm/mach-pxa/pxa25x.c
index
0b9ad30
..
de53f2e
100644
(file)
--- 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,