From 0648095e7374dff746000a55a2f9c40eb6286937 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@freescale.com>
Date: Sat, 25 Jun 2005 14:54:41 -0700
Subject: [PATCH] --- yaml --- r: 3221 b: refs/heads/master c:
 2ec19faf617e61d56fb8da78ccb3ef895c00fae7 h: refs/heads/master i:   3219:
 dd25ae88e170e21cfe4d1a539b4d32cc946cf789 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/ppc/mm/44x_mmu.c          | 1 -
 trunk/arch/ppc/mm/4xx_mmu.c          | 1 -
 trunk/arch/ppc/mm/fsl_booke_mmu.c    | 1 -
 trunk/arch/ppc/platforms/chrp_pci.c  | 1 -
 trunk/arch/ppc/platforms/katana.c    | 2 +-
 trunk/arch/ppc/platforms/pmac_pci.c  | 1 -
 trunk/arch/ppc/syslib/cpm2_common.c  | 2 +-
 trunk/arch/ppc/syslib/indirect_pci.c | 1 -
 trunk/arch/ppc/syslib/mv64x60.c      | 1 -
 trunk/arch/ppc/syslib/mv64x60_win.c  | 1 -
 11 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 8ff30aaa50b4..ee40ed341003 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 912eaa7198827df3cae7d0c9768fd08e84a09675
+refs/heads/master: 2ec19faf617e61d56fb8da78ccb3ef895c00fae7
diff --git a/trunk/arch/ppc/mm/44x_mmu.c b/trunk/arch/ppc/mm/44x_mmu.c
index 72f7c0d1c0ed..3d79ce281b67 100644
--- a/trunk/arch/ppc/mm/44x_mmu.c
+++ b/trunk/arch/ppc/mm/44x_mmu.c
@@ -39,7 +39,6 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/bootmem.h>
 #include <linux/highmem.h>
 
 #include <asm/pgalloc.h>
diff --git a/trunk/arch/ppc/mm/4xx_mmu.c b/trunk/arch/ppc/mm/4xx_mmu.c
index a7f616140381..b7bcbc232f39 100644
--- a/trunk/arch/ppc/mm/4xx_mmu.c
+++ b/trunk/arch/ppc/mm/4xx_mmu.c
@@ -36,7 +36,6 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/bootmem.h>
 #include <linux/highmem.h>
 
 #include <asm/pgalloc.h>
diff --git a/trunk/arch/ppc/mm/fsl_booke_mmu.c b/trunk/arch/ppc/mm/fsl_booke_mmu.c
index 9fa884de5c7c..af9ca0eb6d55 100644
--- a/trunk/arch/ppc/mm/fsl_booke_mmu.c
+++ b/trunk/arch/ppc/mm/fsl_booke_mmu.c
@@ -41,7 +41,6 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/bootmem.h>
 #include <linux/highmem.h>
 
 #include <asm/pgalloc.h>
diff --git a/trunk/arch/ppc/platforms/chrp_pci.c b/trunk/arch/ppc/platforms/chrp_pci.c
index 7d0ee308f662..7d3fbb5c5db2 100644
--- a/trunk/arch/ppc/platforms/chrp_pci.c
+++ b/trunk/arch/ppc/platforms/chrp_pci.c
@@ -9,7 +9,6 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/ide.h>
-#include <linux/bootmem.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/trunk/arch/ppc/platforms/katana.c b/trunk/arch/ppc/platforms/katana.c
index eda922ac3167..169dbf6534b9 100644
--- a/trunk/arch/ppc/platforms/katana.c
+++ b/trunk/arch/ppc/platforms/katana.c
@@ -27,12 +27,12 @@
 #include <linux/root_dev.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
-#include <linux/bootmem.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx.h>
 #ifdef CONFIG_BOOTIMG
 #include <linux/bootimg.h>
 #endif
+#include <asm/io.h>
 #include <asm/page.h>
 #include <asm/time.h>
 #include <asm/smp.h>
diff --git a/trunk/arch/ppc/platforms/pmac_pci.c b/trunk/arch/ppc/platforms/pmac_pci.c
index f6ff51924061..719fb49fe2bc 100644
--- a/trunk/arch/ppc/platforms/pmac_pci.c
+++ b/trunk/arch/ppc/platforms/pmac_pci.c
@@ -17,7 +17,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 
 #include <asm/sections.h>
 #include <asm/io.h>
diff --git a/trunk/arch/ppc/syslib/cpm2_common.c b/trunk/arch/ppc/syslib/cpm2_common.c
index ea5e77080e8d..4c19a4ac7163 100644
--- a/trunk/arch/ppc/syslib/cpm2_common.c
+++ b/trunk/arch/ppc/syslib/cpm2_common.c
@@ -21,8 +21,8 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-#include <linux/bootmem.h>
 #include <linux/module.h>
+#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mpc8260.h>
 #include <asm/page.h>
diff --git a/trunk/arch/ppc/syslib/indirect_pci.c b/trunk/arch/ppc/syslib/indirect_pci.c
index a5a752609e2c..e71488469704 100644
--- a/trunk/arch/ppc/syslib/indirect_pci.c
+++ b/trunk/arch/ppc/syslib/indirect_pci.c
@@ -14,7 +14,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
diff --git a/trunk/arch/ppc/syslib/mv64x60.c b/trunk/arch/ppc/syslib/mv64x60.c
index 7b241e7876bd..cc77177fa1c6 100644
--- a/trunk/arch/ppc/syslib/mv64x60.c
+++ b/trunk/arch/ppc/syslib/mv64x60.c
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/bootmem.h>
 #include <linux/spinlock.h>
 #include <linux/mv643xx.h>
 
diff --git a/trunk/arch/ppc/syslib/mv64x60_win.c b/trunk/arch/ppc/syslib/mv64x60_win.c
index b6f0f5dcf6ee..5b827e2bbe22 100644
--- a/trunk/arch/ppc/syslib/mv64x60_win.c
+++ b/trunk/arch/ppc/syslib/mv64x60_win.c
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/bootmem.h>
 #include <linux/mv643xx.h>
 
 #include <asm/byteorder.h>