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 branch 'for-2.6.36' into for-2.6.37
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
devices.h
diff --git
a/arch/arm/mach-pxa/devices.h
b/arch/arm/mach-pxa/devices.h
index
506fd57
..
491a27a
100644
(file)
--- a/
arch/arm/mach-pxa/devices.h
+++ b/
arch/arm/mach-pxa/devices.h
@@
-1,3
+1,4
@@
+extern struct platform_device pxa_device_pmu;
extern struct platform_device pxa_device_mci;
extern struct platform_device pxa3xx_device_mci2;
extern struct platform_device pxa3xx_device_mci3;