diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 18:13:54 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 18:13:54 +0100 |
commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /arch/arm/mach-clps711x/mm.c | |
parent | 162500b3a3ff39d941d29db49b41a16667ae44f0 (diff) | |
parent | 9b2a606d3898fcb2eedb6faded3bb37549590ac4 (diff) | |
download | op-kernel-dev-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.zip op-kernel-dev-11e4afb49b7fa1fc8e1ffd850c1806dd86a08204.tar.gz |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'arch/arm/mach-clps711x/mm.c')
-rw-r--r-- | arch/arm/mach-clps711x/mm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/mm.c b/arch/arm/mach-clps711x/mm.c index a7b4591..9865921 100644 --- a/arch/arm/mach-clps711x/mm.c +++ b/arch/arm/mach-clps711x/mm.c @@ -22,7 +22,6 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/init.h> -#include <linux/bootmem.h> #include <asm/sizes.h> #include <mach/hardware.h> |