aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-28 10:47:27 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-28 10:47:27 +0000
commit39fbc76272225fb991ffdfac1e08974506cfa3eb (patch)
tree1e3ffcdfd8fc9199da381da95384ec7fbec515c3 /arch/arm
parentbcdbbe3d45fab12eb8a34eb52b89f91624dc4d6f (diff)
parent3f640c61f582e8e770d9930c5ae1bb717b24f830 (diff)
downloadlinux-linaro-stable-39fbc76272225fb991ffdfac1e08974506cfa3eb.tar.gz
Merge branch 'pxa/fixes-non-critical' into next/fixes-non-critical
* pxa/fixes-non-critical: MAINTAINERS: update pxa and mmp ARM: pxa: Include linux/export.h in balloon3.c
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/balloon3.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 4b81f59a4cba..f3a456a0680e 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -13,6 +13,7 @@
* published by the Free Software Foundation.
*/
+#include <linux/export.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>