summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-06 14:17:22 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-06 14:17:22 +0000
commit58a394b3fae8b08e3efb04b740cb85aa4fe98d29 (patch)
tree2122f86c47ab55cb3859077ebb9fadc4ba4277dc /arch
parentfec607aab5dca019cfc76768fa0b5908d47a55b1 (diff)
parentb2dcb8723eb61d00c40d526702d08f6d805f5f01 (diff)
downloadlinux-58a394b3fae8b08e3efb04b740cb85aa4fe98d29.tar.bz2
Merge branch 'fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into fixes
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-prima2/pm.c1
-rw-r--r--arch/arm/mach-prima2/prima2.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/pm.c b/arch/arm/mach-prima2/pm.c
index cb53160f6c5d..26ebb57719df 100644
--- a/arch/arm/mach-prima2/pm.c
+++ b/arch/arm/mach-prima2/pm.c
@@ -9,6 +9,7 @@
#include <linux/kernel.h>
#include <linux/suspend.h>
#include <linux/slab.h>
+#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c
index ef555c041962..a12b689a8702 100644
--- a/arch/arm/mach-prima2/prima2.c
+++ b/arch/arm/mach-prima2/prima2.c
@@ -8,6 +8,7 @@
#include <linux/init.h>
#include <linux/kernel.h>
+#include <asm/sizes.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <linux/of.h>