The patch titled
arch/ppc: remove duplicate includes
has been removed from the -mm tree. Its filename was
arch-ppc-remove-duplicate-includes.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: arch/ppc: remove duplicate includes
From: Lucas Woods <[EMAIL PROTECTED]>
Signed-off-by: Lucas Woods <[EMAIL PROTECTED]>
Cc: Paul Mackerras <[EMAIL PROTECTED]>
Cc: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/ppc/kernel/setup.c | 1 -
arch/ppc/platforms/85xx/stx_gp3.c | 1 -
arch/ppc/syslib/gt64260_pic.c | 1 -
arch/ppc/syslib/mpc52xx_pic.c | 1 -
arch/ppc/syslib/mv64360_pic.c | 1 -
arch/ppc/syslib/ppc83xx_setup.c | 1 -
arch/ppc/xmon/start.c | 1 -
7 files changed, 7 deletions(-)
diff -puN arch/ppc/kernel/setup.c~arch-ppc-remove-duplicate-includes
arch/ppc/kernel/setup.c
--- a/arch/ppc/kernel/setup.c~arch-ppc-remove-duplicate-includes
+++ a/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 -puN arch/ppc/platforms/85xx/stx_gp3.c~arch-ppc-remove-duplicate-includes
arch/ppc/platforms/85xx/stx_gp3.c
--- a/arch/ppc/platforms/85xx/stx_gp3.c~arch-ppc-remove-duplicate-includes
+++ a/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 -puN arch/ppc/syslib/gt64260_pic.c~arch-ppc-remove-duplicate-includes
arch/ppc/syslib/gt64260_pic.c
--- a/arch/ppc/syslib/gt64260_pic.c~arch-ppc-remove-duplicate-includes
+++ a/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 -puN arch/ppc/syslib/mpc52xx_pic.c~arch-ppc-remove-duplicate-includes
arch/ppc/syslib/mpc52xx_pic.c
--- a/arch/ppc/syslib/mpc52xx_pic.c~arch-ppc-remove-duplicate-includes
+++ a/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 -puN arch/ppc/syslib/mv64360_pic.c~arch-ppc-remove-duplicate-includes
arch/ppc/syslib/mv64360_pic.c
--- a/arch/ppc/syslib/mv64360_pic.c~arch-ppc-remove-duplicate-includes
+++ a/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 -puN arch/ppc/syslib/ppc83xx_setup.c~arch-ppc-remove-duplicate-includes
arch/ppc/syslib/ppc83xx_setup.c
--- a/arch/ppc/syslib/ppc83xx_setup.c~arch-ppc-remove-duplicate-includes
+++ a/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 -puN arch/ppc/xmon/start.c~arch-ppc-remove-duplicate-includes
arch/ppc/xmon/start.c
--- a/arch/ppc/xmon/start.c~arch-ppc-remove-duplicate-includes
+++ a/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>
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
git-arm.patch
git-powerpc.patch
git-mips.patch
git-x86.patch
git-xtensa.patch
arch-alpha-removed-duplicate-includes.patch
arch-um-remove-duplicate-includes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
