Merge branch 'fixes' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into fixes

58a394b3 · Arnd Bergmann · fec607aa · b2dcb872 · 58a394b3 · 58a394b3
Commit 58a394b3 authored Dec 06, 2011 by Arnd Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

arch/arm/mach-prima2/pm.c arch/arm/mach-prima2/pm.c +1 -0

arch/arm/mach-prima2/prima2.c arch/arm/mach-prima2/prima2.c +1 -0

No files found.
--- 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>

--- 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>