projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git]
/
arch
/
arm
/
mach-pxa
/
pxa27x.c
diff --git
a/arch/arm/mach-pxa/pxa27x.c
b/arch/arm/mach-pxa/pxa27x.c
index
c059dac
..
12e5b9f
100644
(file)
--- 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)
static struct platform_device *devices[] __initdata = {
&pxa27x_device_udc,
+ &pxa_device_pmu,
&pxa_device_i2s,
&sa1100_device_rtc,
&pxa_device_rtc,