diff options
author | Lucas Woods <woodzy@gmail.com> | 2007-12-13 18:56:06 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 01:13:50 -0500 |
commit | ca55f0570304dd625370f85097fec81dd5a92090 (patch) | |
tree | 50b594f2fa9d146ffb5bb1f11afb63e89783be98 | |
parent | 05ead01554f876b030f4745b2d58db3e53f76ca9 (diff) |
[POWERPC] arch/ppc: Remove duplicate includes
Signed-off-by: Lucas Woods <woodzy@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/ppc/kernel/setup.c | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/85xx/stx_gp3.c | 1 | ||||
-rw-r--r-- | arch/ppc/syslib/gt64260_pic.c | 1 | ||||
-rw-r--r-- | arch/ppc/syslib/mpc52xx_pic.c | 1 | ||||
-rw-r--r-- | arch/ppc/syslib/mv64360_pic.c | 1 | ||||
-rw-r--r-- | arch/ppc/syslib/ppc83xx_setup.c | 1 | ||||
-rw-r--r-- | arch/ppc/xmon/start.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 5255bd80aa6b..3c453029f1c5 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <asm/nvram.h> | 37 | #include <asm/nvram.h> |
38 | #include <asm/xmon.h> | 38 | #include <asm/xmon.h> |
39 | #include <asm/ocp.h> | 39 | #include <asm/ocp.h> |
40 | #include <asm/prom.h> | ||
41 | 40 | ||
42 | #define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \ | 41 | #define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \ |
43 | defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ | 42 | defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ |
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c index b1f5b737c70d..731b40eacfdb 100644 --- a/arch/ppc/platforms/85xx/stx_gp3.c +++ b/arch/ppc/platforms/85xx/stx_gp3.c | |||
@@ -50,7 +50,6 @@ | |||
50 | #include <asm/irq.h> | 50 | #include <asm/irq.h> |
51 | #include <asm/immap_85xx.h> | 51 | #include <asm/immap_85xx.h> |
52 | #include <asm/cpm2.h> | 52 | #include <asm/cpm2.h> |
53 | #include <asm/mpc85xx.h> | ||
54 | #include <asm/ppc_sys.h> | 53 | #include <asm/ppc_sys.h> |
55 | 54 | ||
56 | #include <syslib/cpm2_pic.h> | 55 | #include <syslib/cpm2_pic.h> |
diff --git a/arch/ppc/syslib/gt64260_pic.c b/arch/ppc/syslib/gt64260_pic.c index e84d432c0657..3b4fcca5d1e1 100644 --- a/arch/ppc/syslib/gt64260_pic.c +++ b/arch/ppc/syslib/gt64260_pic.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
36 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
37 | #include <linux/signal.h> | 37 | #include <linux/signal.h> |
38 | #include <linux/stddef.h> | ||
39 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
40 | #include <linux/irq.h> | 39 | #include <linux/irq.h> |
41 | 40 | ||
diff --git a/arch/ppc/syslib/mpc52xx_pic.c b/arch/ppc/syslib/mpc52xx_pic.c index af35a316544a..f58149c03b0f 100644 --- a/arch/ppc/syslib/mpc52xx_pic.c +++ b/arch/ppc/syslib/mpc52xx_pic.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
22 | #include <linux/signal.h> | 22 | #include <linux/signal.h> |
23 | #include <linux/stddef.h> | ||
24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
25 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
26 | 25 | ||
diff --git a/arch/ppc/syslib/mv64360_pic.c b/arch/ppc/syslib/mv64360_pic.c index 4b7a3338e122..2dd2dc5cd404 100644 --- a/arch/ppc/syslib/mv64360_pic.c +++ b/arch/ppc/syslib/mv64360_pic.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
37 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
38 | #include <linux/signal.h> | 38 | #include <linux/signal.h> |
39 | #include <linux/stddef.h> | ||
40 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
41 | #include <linux/irq.h> | 40 | #include <linux/irq.h> |
42 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
diff --git a/arch/ppc/syslib/ppc83xx_setup.c b/arch/ppc/syslib/ppc83xx_setup.c index ec466db52114..ea372914dd6e 100644 --- a/arch/ppc/syslib/ppc83xx_setup.c +++ b/arch/ppc/syslib/ppc83xx_setup.c | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | #include <syslib/ppc83xx_setup.h> | 42 | #include <syslib/ppc83xx_setup.h> |
43 | #if defined(CONFIG_PCI) | 43 | #if defined(CONFIG_PCI) |
44 | #include <asm/delay.h> | ||
45 | #include <syslib/ppc83xx_pci.h> | 44 | #include <syslib/ppc83xx_pci.h> |
46 | #endif | 45 | #endif |
47 | 46 | ||
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c index 8f0b953179fa..9056fe58aaa1 100644 --- a/arch/ppc/xmon/start.c +++ b/arch/ppc/xmon/start.c | |||
@@ -10,7 +10,6 @@ | |||
10 | #include <linux/sysrq.h> | 10 | #include <linux/sysrq.h> |
11 | #include <linux/bitops.h> | 11 | #include <linux/bitops.h> |
12 | #include <asm/xmon.h> | 12 | #include <asm/xmon.h> |
13 | #include <asm/machdep.h> | ||
14 | #include <asm/errno.h> | 13 | #include <asm/errno.h> |
15 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
16 | #include <asm/delay.h> | 15 | #include <asm/delay.h> |