diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:17:22 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:17:22 +0000 |
| commit | 58a394b3fae8b08e3efb04b740cb85aa4fe98d29 (patch) | |
| tree | 2122f86c47ab55cb3859077ebb9fadc4ba4277dc /arch | |
| parent | fec607aab5dca019cfc76768fa0b5908d47a55b1 (diff) | |
| parent | b2dcb8723eb61d00c40d526702d08f6d805f5f01 (diff) | |
| download | op-kernel-dev-58a394b3fae8b08e3efb04b740cb85aa4fe98d29.zip op-kernel-dev-58a394b3fae8b08e3efb04b740cb85aa4fe98d29.tar.gz | |
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 cb53160..26ebb57 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 ef555c0..a12b689 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> |
