Merge branch 'for-2.6.36' into for-2.6.37

[~andy/linux] / arch / arm / mach-pxa / devices.h

diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index 506fd5753ccc4781066997335455ebec84fc109b..491a27a92735471716f91b57f6d98b9c7d4745dc 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;