diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:17:22 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:17:22 -0500 |
commit | 58a394b3fae8b08e3efb04b740cb85aa4fe98d29 (patch) | |
tree | 2122f86c47ab55cb3859077ebb9fadc4ba4277dc /arch | |
parent | fec607aab5dca019cfc76768fa0b5908d47a55b1 (diff) | |
parent | b2dcb8723eb61d00c40d526702d08f6d805f5f01 (diff) |
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.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-prima2/prima2.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/pm.c b/arch/arm/mach-prima2/pm.c index cb53160f6c5..26ebb57719d 100644 --- a/arch/arm/mach-prima2/pm.c +++ b/arch/arm/mach-prima2/pm.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
10 | #include <linux/suspend.h> | 10 | #include <linux/suspend.h> |
11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
12 | #include <linux/module.h> | ||
12 | #include <linux/of.h> | 13 | #include <linux/of.h> |
13 | #include <linux/of_address.h> | 14 | #include <linux/of_address.h> |
14 | #include <linux/of_device.h> | 15 | #include <linux/of_device.h> |
diff --git a/arch/arm/mach-prima2/prima2.c b/arch/arm/mach-prima2/prima2.c index ef555c04196..a12b689a870 100644 --- a/arch/arm/mach-prima2/prima2.c +++ b/arch/arm/mach-prima2/prima2.c | |||
@@ -8,6 +8,7 @@ | |||
8 | 8 | ||
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <asm/sizes.h> | ||
11 | #include <asm/mach-types.h> | 12 | #include <asm/mach-types.h> |
12 | #include <asm/mach/arch.h> | 13 | #include <asm/mach/arch.h> |
13 | #include <linux/of.h> | 14 | #include <linux/of.h> |