diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-09 21:15:25 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-09 21:15:25 +0100 |
| commit | a0d66ac89296334621c60b437027df23e57369c9 (patch) | |
| tree | 17e15c3cfe9e203baefcadf36b6645565801f4ff /arch/arm/mach-versatile | |
| parent | b55ab99a606e61c9f0deec7f29063f4770133444 (diff) | |
| parent | 4bddaf66093ce0e0c1fce505f091f4cd52e73e2e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-versatile')
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/pci.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index 60baba65635e..3dff8641b03f 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -29,6 +29,7 @@ #include <linux/amba/pl061.h> #include <linux/amba/mmci.h> #include <linux/io.h> +#include <linux/gfp.h> #include <asm/clkdev.h> #include <asm/system.h> diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c index 7161ba23b58a..334f0df4e948 100644 --- a/arch/arm/mach-versatile/pci.c +++ b/arch/arm/mach-versatile/pci.c @@ -16,7 +16,6 @@ */ #include <linux/kernel.h> #include <linux/pci.h> -#include <linux/slab.h> #include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/spinlock.h> |