From 1a5870ade14ef07cb67bba7c6a558040b18b4cf8 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 25 Mar 2010 17:06:19 +0000
Subject: [PATCH] --- yaml --- r: 191744 b: refs/heads/master c:
 6262c92f51ffb074800d5a340ee16bc06758e037 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/arm/mach-clps711x/mm.c           | 1 -
 trunk/arch/arm/mach-ixp4xx/common.c         | 1 -
 trunk/arch/arm/mach-omap1/board-htcherald.c | 1 -
 trunk/arch/arm/mach-omap2/omap_hwmod.c      | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 75aaed6824cd..fb69b3700c80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7072c63c1b0611042ba6ecf0152a33c7b806e67
+refs/heads/master: 6262c92f51ffb074800d5a340ee16bc06758e037
diff --git a/trunk/arch/arm/mach-clps711x/mm.c b/trunk/arch/arm/mach-clps711x/mm.c
index a7b4591205a3..986592176767 100644
--- a/trunk/arch/arm/mach-clps711x/mm.c
+++ b/trunk/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>
diff --git a/trunk/arch/arm/mach-ixp4xx/common.c b/trunk/arch/arm/mach-ixp4xx/common.c
index 71728d36d501..0bce09799d18 100644
--- a/trunk/arch/arm/mach-ixp4xx/common.c
+++ b/trunk/arch/arm/mach-ixp4xx/common.c
@@ -21,7 +21,6 @@
 #include <linux/tty.h>
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
-#include <linux/bootmem.h>
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/time.h>
diff --git a/trunk/arch/arm/mach-omap1/board-htcherald.c b/trunk/arch/arm/mach-omap1/board-htcherald.c
index e36639f66150..8e313b4b99a9 100644
--- a/trunk/arch/arm/mach-omap1/board-htcherald.c
+++ b/trunk/arch/arm/mach-omap1/board-htcherald.c
@@ -28,7 +28,6 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
-#include <linux/bootmem.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
 
diff --git a/trunk/arch/arm/mach-omap2/omap_hwmod.c b/trunk/arch/arm/mach-omap2/omap_hwmod.c
index c6649472ce0d..aa3e20915d72 100644
--- a/trunk/arch/arm/mach-omap2/omap_hwmod.c
+++ b/trunk/arch/arm/mach-omap2/omap_hwmod.c
@@ -43,7 +43,6 @@
 #include <linux/err.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
-#include <linux/bootmem.h>
 
 #include <plat/common.h>
 #include <plat/cpu.h>