summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/devices.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-08-16 23:09:34 +0200
committerDavid S. Miller <davem@davemloft.net>2010-08-16 23:09:34 +0200
commit300a103d1504134f8c4a7e831f995e917ea9b1e4 (patch)
tree7f94d5fff513d132bd0b57a9e3bd96c4cc80d707 /arch/arm/mach-pxa/devices.h
parentsparc: Really fix "console=" for serial consoles. (diff)
parentLinux 2.6.36-rc1 (diff)
downloadlinux-300a103d1504134f8c4a7e831f995e917ea9b1e4.tar.xz
linux-300a103d1504134f8c4a7e831f995e917ea9b1e4.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/devices.h')
-rw-r--r--arch/arm/mach-pxa/devices.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index 93817d99761e..50353ea49ba4 100644
--- 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;