summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/balloon3.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 14:20:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 14:20:39 -0800
commit57e964e1ae9bd4f699ae1074430bcf81a9a11377 (patch)
tree8c1fc5199e18a55cece4aa72bbaf2ca909bd1453 /arch/arm/mach-pxa/balloon3.c
parent4dee6b64ee7cfef94b47733c6d9fef07f8051c7c (diff)
parent39fbc76272225fb991ffdfac1e08974506cfa3eb (diff)
downloadop-kernel-dev-57e964e1ae9bd4f699ae1074430bcf81a9a11377.zip
op-kernel-dev-57e964e1ae9bd4f699ae1074430bcf81a9a11377.tar.gz
Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Non-critical bug fixes Simple bug fixes that were not considered important enough for inclusion into 3.2. * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: MAINTAINERS: update pxa and mmp ARM: pxa: Include linux/export.h in balloon3.c ARM: OMAP4: clock: Add CPU local timer clock node ARM: OMAP4: hwmod: Don't wait for the idle status if modulemode is not supported ARM: OMAP: AM3517/3505: fix crash on boot due to incorrect voltagedomain data ARM: OMAP: hwmod data: fix the panic on Nokia RM-680 during boot ARM: OMAP2+: DMA: Workaround for invalid destination position ARM: OMAP2+: DMA: Workaround for invalid source position
Diffstat (limited to 'arch/arm/mach-pxa/balloon3.c')
-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 82514f5..a34de9a 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>
OpenPOWER on IntegriCloud