From 3c00c4eecc63679a86d0934099c10ea751095cbc Mon Sep 17 00:00:00 2001
From: Lucas Woods <woodzy@gmail.com>
Date: Thu, 13 Dec 2007 15:56:06 -0800
Subject: [PATCH] --- yaml --- r: 81133 b: refs/heads/master c:
 ca55f0570304dd625370f85097fec81dd5a92090 h: refs/heads/master i:   81131:
 78dc1aeb81f33460454e5653e528c15ecfb85250 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/ppc/kernel/setup.c           | 1 -
 trunk/arch/ppc/platforms/85xx/stx_gp3.c | 1 -
 trunk/arch/ppc/syslib/gt64260_pic.c     | 1 -
 trunk/arch/ppc/syslib/mpc52xx_pic.c     | 1 -
 trunk/arch/ppc/syslib/mv64360_pic.c     | 1 -
 trunk/arch/ppc/syslib/ppc83xx_setup.c   | 1 -
 trunk/arch/ppc/xmon/start.c             | 1 -
 8 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 69bf4f3eb3d8..be657ecf4554 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05ead01554f876b030f4745b2d58db3e53f76ca9
+refs/heads/master: ca55f0570304dd625370f85097fec81dd5a92090
diff --git a/trunk/arch/ppc/kernel/setup.c b/trunk/arch/ppc/kernel/setup.c
index 5255bd80aa6b..3c453029f1c5 100644
--- a/trunk/arch/ppc/kernel/setup.c
+++ b/trunk/arch/ppc/kernel/setup.c
@@ -37,7 +37,6 @@
 #include <asm/nvram.h>
 #include <asm/xmon.h>
 #include <asm/ocp.h>
-#include <asm/prom.h>
 
 #define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \
 		      defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
diff --git a/trunk/arch/ppc/platforms/85xx/stx_gp3.c b/trunk/arch/ppc/platforms/85xx/stx_gp3.c
index b1f5b737c70d..731b40eacfdb 100644
--- a/trunk/arch/ppc/platforms/85xx/stx_gp3.c
+++ b/trunk/arch/ppc/platforms/85xx/stx_gp3.c
@@ -50,7 +50,6 @@
 #include <asm/irq.h>
 #include <asm/immap_85xx.h>
 #include <asm/cpm2.h>
-#include <asm/mpc85xx.h>
 #include <asm/ppc_sys.h>
 
 #include <syslib/cpm2_pic.h>
diff --git a/trunk/arch/ppc/syslib/gt64260_pic.c b/trunk/arch/ppc/syslib/gt64260_pic.c
index e84d432c0657..3b4fcca5d1e1 100644
--- a/trunk/arch/ppc/syslib/gt64260_pic.c
+++ b/trunk/arch/ppc/syslib/gt64260_pic.c
@@ -35,7 +35,6 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/stddef.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
 
diff --git a/trunk/arch/ppc/syslib/mpc52xx_pic.c b/trunk/arch/ppc/syslib/mpc52xx_pic.c
index af35a316544a..f58149c03b0f 100644
--- a/trunk/arch/ppc/syslib/mpc52xx_pic.c
+++ b/trunk/arch/ppc/syslib/mpc52xx_pic.c
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/stddef.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
 
diff --git a/trunk/arch/ppc/syslib/mv64360_pic.c b/trunk/arch/ppc/syslib/mv64360_pic.c
index 4b7a3338e122..2dd2dc5cd404 100644
--- a/trunk/arch/ppc/syslib/mv64360_pic.c
+++ b/trunk/arch/ppc/syslib/mv64360_pic.c
@@ -36,7 +36,6 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/stddef.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
diff --git a/trunk/arch/ppc/syslib/ppc83xx_setup.c b/trunk/arch/ppc/syslib/ppc83xx_setup.c
index ec466db52114..ea372914dd6e 100644
--- a/trunk/arch/ppc/syslib/ppc83xx_setup.c
+++ b/trunk/arch/ppc/syslib/ppc83xx_setup.c
@@ -41,7 +41,6 @@
 
 #include <syslib/ppc83xx_setup.h>
 #if defined(CONFIG_PCI)
-#include <asm/delay.h>
 #include <syslib/ppc83xx_pci.h>
 #endif
 
diff --git a/trunk/arch/ppc/xmon/start.c b/trunk/arch/ppc/xmon/start.c
index 8f0b953179fa..9056fe58aaa1 100644
--- a/trunk/arch/ppc/xmon/start.c
+++ b/trunk/arch/ppc/xmon/start.c
@@ -10,7 +10,6 @@
 #include <linux/sysrq.h>
 #include <linux/bitops.h>
 #include <asm/xmon.h>
-#include <asm/machdep.h>
 #include <asm/errno.h>
 #include <asm/processor.h>
 #include <asm/delay.h>