summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/devices.h
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-10-12 15:09:06 +0200
committerMichal Marek <mmarek@suse.cz>2010-10-12 15:09:06 +0200
commit239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch)
tree77f79810e57d4fc24356eca0cd6db463e8994128 /arch/arm/mach-pxa/devices.h
parentkconfig: Use PATH_MAX instead of 128 for path buffer sizes. (diff)
parentkbuild: fix oldnoconfig to do the right thing (diff)
downloadlinux-239060b93bb30a4ad55f1ecaa512464a035cc5ba.tar.xz
linux-239060b93bb30a4ad55f1ecaa512464a035cc5ba.zip
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
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;