linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] remove duplicate includes
@ 2015-07-02 21:40 Matteo Croce
  0 siblings, 0 replies; 10+ messages in thread
From: Matteo Croce @ 2015-07-02 21:40 UTC (permalink / raw)
  To: linux-kernel; +Cc: Matteo Croce

Remove duplicate include directive.
Duplicates are found with a script like:

for i in $(find -name '*.c'); do
  grep -H '#include' "$i" \
    |sed -e 's/#include *//' -e '/<.*>/s/[<>]//g' -e '/".*"/s/"//g' \
    |sort |uniq -d
done

includes like asm/syscalls_64.h that needs to be included
more than once aren't removed, sorry if someone was removed by error

Signed-off-by: Matteo Croce <matteo@openwrt.org>
---
 arch/arc/kernel/troubleshoot.c                    | 3 ---
 arch/arm/crypto/aes-ce-glue.c                     | 1 -
 arch/arm/mach-clps711x/board-edb7211.c            | 1 -
 arch/arm/mach-ixp4xx/dsmg600-setup.c              | 1 -
 arch/arm/mach-lpc32xx/phy3250.c                   | 1 -
 arch/arm/mach-omap1/board-voiceblue.c             | 1 -
 arch/arm/mach-sa1100/hackkit.c                    | 1 -
 arch/arm/mm/mmu.c                                 | 2 --
 arch/arm/xen/mm.c                                 | 1 -
 arch/blackfin/kernel/irqchip.c                    | 1 -
 arch/blackfin/mach-common/ints-priority.c         | 1 -
 arch/nios2/mm/fault.c                             | 1 -
 arch/powerpc/kernel/time.c                        | 1 -
 arch/powerpc/kernel/traps.c                       | 3 +--
 arch/powerpc/mm/numa.c                            | 1 -
 arch/sh/boards/mach-dreamcast/irq.c               | 1 -
 arch/x86/kernel/process.c                         | 1 -
 arch/x86/kernel/smpboot.c                         | 1 -
 arch/x86/platform/ce4100/ce4100.c                 | 1 -
 arch/x86/xen/grant-table.c                        | 1 -
 crypto/jitterentropy-kcapi.c                      | 1 -
 drivers/block/skd_main.c                          | 1 -
 drivers/crypto/nx/nx.c                            | 1 -
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c             | 1 -
 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c        | 1 -
 drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c | 1 -
 drivers/iio/accel/mma8452.c                       | 1 -
 drivers/media/usb/dvb-usb/dw2102.c                | 1 -
 drivers/misc/cxl/native.c                         | 1 -
 drivers/misc/genwqe/card_base.c                   | 1 -
 drivers/misc/genwqe/card_ddcb.c                   | 1 -
 drivers/misc/genwqe/card_utils.c                  | 2 --
 drivers/mmc/host/android-goldfish.c               | 2 --
 drivers/net/dsa/bcm_sf2.c                         | 1 -
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c   | 1 -
 drivers/net/ethernet/freescale/gianfar.c          | 2 --
 drivers/net/vxlan.c                               | 1 -
 drivers/net/wireless/ath/ath10k/mac.c             | 1 -
 drivers/net/wireless/ath/ath10k/wmi-tlv.c         | 1 -
 drivers/net/wireless/ath/ath5k/debug.c            | 1 -
 drivers/net/wireless/rtlwifi/rtl8188ee/trx.c      | 1 -
 drivers/net/wireless/rtlwifi/rtl8821ae/trx.c      | 1 -
 drivers/of/overlay.c                              | 1 -
 drivers/of/resolver.c                             | 1 -
 drivers/of/unittest.c                             | 1 -
 drivers/platform/x86/alienware-wmi.c              | 1 -
 drivers/pnp/quirks.c                              | 2 --
 drivers/power/axp288_charger.c                    | 1 -
 drivers/power/axp288_fuel_gauge.c                 | 1 -
 drivers/scsi/qla2xxx/qla_nx2.c                    | 2 --
 drivers/thermal/of-thermal.c                      | 1 -
 fs/ext4/crypto_fname.c                            | 1 -
 fs/nfs/dns_resolve.c                              | 1 -
 tools/testing/selftests/timers/skew_consistency.c | 1 -
 54 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index e0cf998..691832a 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -245,9 +245,6 @@ void show_kernel_fault_diag(const char *str, struct pt_regs *regs,
 
 #ifdef CONFIG_DEBUG_FS
 
-#include <linux/module.h>
-#include <linux/fs.h>
-#include <linux/mount.h>
 #include <linux/pagemap.h>
 #include <linux/init.h>
 #include <linux/namei.h>
diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c
index b445a5d..bb14076 100644
--- a/arch/arm/crypto/aes-ce-glue.c
+++ b/arch/arm/crypto/aes-ce-glue.c
@@ -10,7 +10,6 @@
 
 #include <asm/hwcap.h>
 #include <asm/neon.h>
-#include <asm/hwcap.h>
 #include <crypto/aes.h>
 #include <crypto/ablk_helper.h>
 #include <crypto/algapi.h>
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
index f339797..c46c5b4 100644
--- a/arch/arm/mach-clps711x/board-edb7211.c
+++ b/arch/arm/mach-clps711x/board-edb7211.c
@@ -17,7 +17,6 @@
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
-#include <linux/memblock.h>
 
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 43ee06d..b3bd0e1 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -26,7 +26,6 @@
 #include <linux/reboot.h>
 #include <linux/i2c.h>
 #include <linux/i2c-gpio.h>
-#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index 7858d5b..383ce30 100644
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -23,7 +23,6 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/dma-mapping.h>
-#include <linux/device.h>
 #include <linux/gpio.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index e960687..0c91dc3 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -26,7 +26,6 @@
 #include <linux/serial_reg.h>
 #include <linux/smc91x.h>
 #include <linux/export.h>
-#include <linux/reboot.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c
index 643d5f2..0016d25 100644
--- a/arch/arm/mach-sa1100/hackkit.c
+++ b/arch/arm/mach-sa1100/hackkit.c
@@ -22,7 +22,6 @@
 #include <linux/serial_core.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/tty.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 6ca7d9a..372c7c0 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -23,7 +23,6 @@
 #include <asm/sections.h>
 #include <asm/cachetype.h>
 #include <asm/fixmap.h>
-#include <asm/sections.h>
 #include <asm/setup.h>
 #include <asm/smp_plat.h>
 #include <asm/tlb.h>
@@ -36,7 +35,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/pci.h>
-#include <asm/fixmap.h>
 
 #include "mm.h"
 #include "tcm.h"
diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c
index 03e75fe..ecda4a4 100644
--- a/arch/arm/xen/mm.c
+++ b/arch/arm/xen/mm.c
@@ -8,7 +8,6 @@
 #include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
 #include <linux/swiotlb.h>
 
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index 0ba2576..cff0457 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -11,7 +11,6 @@
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/seq_file.h>
 #include <asm/irq_handler.h>
 #include <asm/trace.h>
 #include <asm/pda.h>
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 7236bdf..0c5abeb 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -26,7 +26,6 @@
 #include <asm/gpio.h>
 #include <asm/irq_handler.h>
 #include <asm/dpmc.h>
-#include <asm/traps.h>
 
 /*
  * NOTES:
diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c
index b51878b..32bf4a3 100644
--- a/arch/nios2/mm/fault.c
+++ b/arch/nios2/mm/fault.c
@@ -23,7 +23,6 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
-#include <linux/ptrace.h>
 
 #include <asm/mmu_context.h>
 #include <asm/traps.h>
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 4392250..eadef55 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -74,7 +74,6 @@
 
 /* powerpc clocksource/clockevent code */
 
-#include <linux/clockchips.h>
 #include <linux/timekeeper_internal.h>
 
 static cycle_t rtc_read(struct clocksource *);
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 6530f1b..414a6d1 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -51,14 +51,13 @@
 #ifdef CONFIG_PPC64
 #include <asm/firmware.h>
 #include <asm/processor.h>
-#include <asm/tm.h>
 #endif
+#include <asm/tm.h>
 #include <asm/kexec.h>
 #include <asm/ppc-opcode.h>
 #include <asm/rio.h>
 #include <asm/fadump.h>
 #include <asm/switch_to.h>
-#include <asm/tm.h>
 #include <asm/debug.h>
 #include <sysdev/fsl_pci.h>
 
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 5e80621..5a4420b 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -33,7 +33,6 @@
 #include <asm/sparsemem.h>
 #include <asm/prom.h>
 #include <asm/smp.h>
-#include <asm/cputhreads.h>
 #include <asm/topology.h>
 #include <asm/firmware.h>
 #include <asm/paca.h>
diff --git a/arch/sh/boards/mach-dreamcast/irq.c b/arch/sh/boards/mach-dreamcast/irq.c
index 2789647..69fa91c 100644
--- a/arch/sh/boards/mach-dreamcast/irq.c
+++ b/arch/sh/boards/mach-dreamcast/irq.c
@@ -10,7 +10,6 @@
  */
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/irq.h>
 #include <linux/export.h>
 #include <linux/err.h>
 #include <mach/sysasic.h>
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 9cad694..c412011 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -15,7 +15,6 @@
 #include <linux/dmi.h>
 #include <linux/utsname.h>
 #include <linux/stackprotector.h>
-#include <linux/tick.h>
 #include <linux/cpuidle.h>
 #include <trace/events/power.h>
 #include <linux/hw_breakpoint.h>
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 8add66b..34f77ba 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -73,7 +73,6 @@
 #include <asm/uv/uv.h>
 #include <linux/mc146818rtc.h>
 #include <asm/i8259.h>
-#include <asm/realmode.h>
 #include <asm/misc.h>
 
 /* Number of siblings per CPU package */
diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c
index 701fd58..c384bf0 100644
--- a/arch/x86/platform/ce4100/ce4100.c
+++ b/arch/x86/platform/ce4100/ce4100.c
@@ -15,7 +15,6 @@
 #include <linux/reboot.h>
 #include <linux/serial_reg.h>
 #include <linux/serial_8250.h>
-#include <linux/reboot.h>
 
 #include <asm/ce4100.h>
 #include <asm/prom.h>
diff --git a/arch/x86/xen/grant-table.c b/arch/x86/xen/grant-table.c
index 1580e7a..5a1e317 100644
--- a/arch/x86/xen/grant-table.c
+++ b/arch/x86/xen/grant-table.c
@@ -113,7 +113,6 @@ int arch_gnttab_init(unsigned long nr_shared)
 #ifdef CONFIG_XEN_PVH
 #include <xen/balloon.h>
 #include <xen/events.h>
-#include <linux/slab.h>
 static int __init xlated_setup_gnttab_pages(void)
 {
 	struct page **pages;
diff --git a/crypto/jitterentropy-kcapi.c b/crypto/jitterentropy-kcapi.c
index b32d834..2fb614f 100644
--- a/crypto/jitterentropy-kcapi.c
+++ b/crypto/jitterentropy-kcapi.c
@@ -39,7 +39,6 @@
 
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/fips.h>
 #include <linux/time.h>
 #include <linux/crypto.h>
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index 1e46eb2..1ed9104 100644
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -36,7 +36,6 @@
 #include <linux/scatterlist.h>
 #include <linux/version.h>
 #include <linux/err.h>
-#include <linux/scatterlist.h>
 #include <linux/aer.h>
 #include <linux/ctype.h>
 #include <linux/wait.h>
diff --git a/drivers/crypto/nx/nx.c b/drivers/crypto/nx/nx.c
index f6198f2..fdc7662 100644
--- a/drivers/crypto/nx/nx.c
+++ b/drivers/crypto/nx/nx.c
@@ -32,7 +32,6 @@
 #include <linux/scatterlist.h>
 #include <linux/device.h>
 #include <linux/of.h>
-#include <linux/types.h>
 #include <asm/hvcall.h>
 #include <asm/vio.h>
 
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 14242bd..c12b725 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -41,7 +41,6 @@
 #include "gca/gfx_8_0_d.h"
 #include "gca/gfx_8_0_enum.h"
 #include "gca/gfx_8_0_sh_mask.h"
-#include "gca/gfx_8_0_enum.h"
 
 #include "uvd/uvd_5_0_d.h"
 #include "uvd/uvd_5_0_sh_mask.h"
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index a5e99ac..96fd5e8 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <video/mipi_display.h>
 #include <asm/intel-mid.h>
-#include <video/mipi_display.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 #include "intel_dsi.h"
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
index c630136..b9169c7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/nv40.c
@@ -35,7 +35,6 @@
 #include <subdev/timer.h>
 #include <subdev/fb.h>
 #include <subdev/instmem.h>
-#include <subdev/mmu.h>
 #include <subdev/volt.h>
 
 #include <engine/dmaobj.h>
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index e8e2077..b996177 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -16,7 +16,6 @@
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
-#include <linux/iio/trigger_consumer.h>
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/trigger_consumer.h>
diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
index 14ef25d..f2ad3a5 100644
--- a/drivers/media/usb/dvb-usb/dw2102.c
+++ b/drivers/media/usb/dvb-usb/dw2102.c
@@ -33,7 +33,6 @@
 #include "tda18271.h"
 #include "cxd2820r.h"
 #include "m88ds3103.h"
-#include "ts2020.h"
 
 /* Max transfer size done by I2C transfer functions */
 #define MAX_XFER_SIZE  64
diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
index 10567f2..5f2aecc 100644
--- a/drivers/misc/cxl/native.c
+++ b/drivers/misc/cxl/native.c
@@ -10,7 +10,6 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/sched.h>
 #include <linux/mutex.h>
 #include <linux/mm.h>
 #include <linux/uaccess.h>
diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_base.c
index 4cf8f82..6558cee 100644
--- a/drivers/misc/genwqe/card_base.c
+++ b/drivers/misc/genwqe/card_base.c
@@ -34,7 +34,6 @@
 #include <linux/wait.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
-#include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/device.h>
 #include <linux/log2.h>
diff --git a/drivers/misc/genwqe/card_ddcb.c b/drivers/misc/genwqe/card_ddcb.c
index 6d51e5f..5bb584c 100644
--- a/drivers/misc/genwqe/card_ddcb.c
+++ b/drivers/misc/genwqe/card_ddcb.c
@@ -34,7 +34,6 @@
 #include <linux/string.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
-#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/crc-itu-t.h>
 
diff --git a/drivers/misc/genwqe/card_utils.c b/drivers/misc/genwqe/card_utils.c
index 1ca94e6..75bae89 100644
--- a/drivers/misc/genwqe/card_utils.c
+++ b/drivers/misc/genwqe/card_utils.c
@@ -32,11 +32,9 @@
 #include <linux/iommu.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <linux/dma-mapping.h>
 #include <linux/ctype.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/delay.h>
 #include <asm/pgtable.h>
 
 #include "genwqe_driver.h"
diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c
index b1eac71..7b835f2 100644
--- a/drivers/mmc/host/android-goldfish.c
+++ b/drivers/mmc/host/android-goldfish.c
@@ -42,13 +42,11 @@
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 #include <linux/clk.h>
-#include <linux/scatterlist.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
 
 #include <asm/types.h>
-#include <asm/io.h>
 #include <asm/uaccess.h>
 
 #define DRIVER_NAME "goldfish_mmc"
diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 972982f..572e86e 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -14,7 +14,6 @@
 #include <linux/netdevice.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/of.h>
 #include <linux/phy.h>
 #include <linux/phy_fixed.h>
 #include <linux/mii.h>
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 351f3b1..5b39bcf 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -62,7 +62,6 @@
 #include <net/netevent.h>
 #include <net/addrconf.h>
 #include <net/bonding.h>
-#include <net/addrconf.h>
 #include <asm/uaccess.h>
 
 #include "cxgb4.h"
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index ff87502..dceda26 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -102,8 +102,6 @@
 #include <linux/phy_fixed.h>
 #include <linux/of.h>
 #include <linux/of_net.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
 
 #include "gianfar.h"
 
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 34c519e..562b065 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -42,7 +42,6 @@
 #include <net/netns/generic.h>
 #include <net/vxlan.h>
 #include <net/protocol.h>
-#include <net/udp_tunnel.h>
 #if IS_ENABLED(CONFIG_IPV6)
 #include <net/ipv6.h>
 #include <net/addrconf.h>
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 218b6af..6f31cde 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -23,7 +23,6 @@
 #include "hif.h"
 #include "core.h"
 #include "debug.h"
-#include "wmi.h"
 #include "htt.h"
 #include "txrx.h"
 #include "testmode.h"
diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
index 8fdba38..1a084de 100644
--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
+++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
@@ -18,7 +18,6 @@
 #include "debug.h"
 #include "mac.h"
 #include "hw.h"
-#include "mac.h"
 #include "wmi.h"
 #include "wmi-ops.h"
 #include "wmi-tlv.h"
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index c70782e..3997286 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -66,7 +66,6 @@
 
 #include <linux/seq_file.h>
 #include <linux/list.h>
-#include <linux/vmalloc.h>
 #include "debug.h"
 #include "ath5k.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
index 791efbe..67733f6 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c
@@ -33,7 +33,6 @@
 #include "trx.h"
 #include "led.h"
 #include "dm.h"
-#include "phy.h"
 
 static u8 _rtl88ee_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
 {
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
index 174743a..0801340 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/trx.c
@@ -33,7 +33,6 @@
 #include "trx.h"
 #include "led.h"
 #include "dm.h"
-#include "phy.h"
 #include "fw.h"
 
 static u8 _rtl8821ae_map_hwqueue_to_fwqueue(struct sk_buff *skb, u8 hw_queue)
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 24e025f..94c23ac 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -16,7 +16,6 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
-#include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/idr.h>
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 640eb4c..8d2947a 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -16,7 +16,6 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/errno.h>
-#include <linux/string.h>
 #include <linux/slab.h>
 
 /* illegal phandle value (set when unresolved) */
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 1801634..7662fe5 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -18,7 +18,6 @@
 #include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <linux/of_platform.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
index 1e1e594..065b548 100644
--- a/drivers/platform/x86/alienware-wmi.c
+++ b/drivers/platform/x86/alienware-wmi.c
@@ -21,7 +21,6 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/dmi.h>
-#include <linux/acpi.h>
 #include <linux/leds.h>
 
 #define LEGACY_CONTROL_GUID		"A90597CE-A997-11DA-B012-B622A1EF5492"
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 943c1cb..922c1d5 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -226,8 +226,6 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *dev)
 	dev_info(&dev->dev, "made independent IRQ optional\n");
 }
 
-#include <linux/pci.h>
-
 static void quirk_system_pci_resources(struct pnp_dev *dev)
 {
 	struct pci_dev *pdev = NULL;
diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c
index e4d569f..b3c0fc13c 100644
--- a/drivers/power/axp288_charger.c
+++ b/drivers/power/axp288_charger.c
@@ -23,7 +23,6 @@
 #include <linux/usb/otg.h>
 #include <linux/notifier.h>
 #include <linux/power_supply.h>
-#include <linux/notifier.h>
 #include <linux/property.h>
 #include <linux/mfd/axp20x.h>
 #include <linux/extcon.h>
diff --git a/drivers/power/axp288_fuel_gauge.c b/drivers/power/axp288_fuel_gauge.c
index 50c0110..5bdde69 100644
--- a/drivers/power/axp288_fuel_gauge.c
+++ b/drivers/power/axp288_fuel_gauge.c
@@ -22,7 +22,6 @@
 #include <linux/regmap.h>
 #include <linux/jiffies.h>
 #include <linux/interrupt.h>
-#include <linux/device.h>
 #include <linux/workqueue.h>
 #include <linux/mfd/axp20x.h>
 #include <linux/platform_device.h>
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index 000c57e..4960016 100644
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -11,8 +11,6 @@
 #include "qla_def.h"
 #include "qla_gbl.h"
 
-#include <linux/delay.h>
-
 #define TIMEOUT_100_MS 100
 
 /* 8044 Flash Read/Write functions */
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index b295b2b..723718f 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -30,7 +30,6 @@
 #include <linux/err.h>
 #include <linux/export.h>
 #include <linux/string.h>
-#include <linux/thermal.h>
 
 #include "thermal_core.h"
 
diff --git a/fs/ext4/crypto_fname.c b/fs/ext4/crypto_fname.c
index 7dc4eb5..4c11768 100644
--- a/fs/ext4/crypto_fname.c
+++ b/fs/ext4/crypto_fname.c
@@ -19,7 +19,6 @@
 #include <linux/gfp.h>
 #include <linux/kernel.h>
 #include <linux/key.h>
-#include <linux/key.h>
 #include <linux/list.h>
 #include <linux/mempool.h>
 #include <linux/random.h>
diff --git a/fs/nfs/dns_resolve.c b/fs/nfs/dns_resolve.c
index d25f10f..d46d030 100644
--- a/fs/nfs/dns_resolve.c
+++ b/fs/nfs/dns_resolve.c
@@ -37,7 +37,6 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen,
 #include <linux/string.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/socket.h>
 #include <linux/seq_file.h>
 #include <linux/inet.h>
diff --git a/tools/testing/selftests/timers/skew_consistency.c b/tools/testing/selftests/timers/skew_consistency.c
index 5562f84..b56e4ac 100644
--- a/tools/testing/selftests/timers/skew_consistency.c
+++ b/tools/testing/selftests/timers/skew_consistency.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
 #ifdef KTEST
-- 
2.1.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH] remove duplicate #includes
  2006-02-13  9:39 [PATCH] remove duplicate #includes Herbert Poetzl
                   ` (2 preceding siblings ...)
  2006-02-14 21:03 ` Jean Delvare
@ 2006-02-15 10:12 ` Russell King
  3 siblings, 0 replies; 10+ messages in thread
From: Russell King @ 2006-02-15 10:12 UTC (permalink / raw)
  To: Andrew Morton, Linux Kernel ML

On Mon, Feb 13, 2006 at 10:39:59AM +0100, Herbert Poetzl wrote:
> diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop321-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop321-setup.c
> --- linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop321-setup.c	2006-02-07 11:52:06 +0100
> +++ linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop321-setup.c	2006-02-13 01:14:57 +0100
> @@ -13,7 +13,6 @@
>  #include <linux/mm.h>
>  #include <linux/init.h>
>  #include <linux/config.h>
> -#include <linux/init.h>
>  #include <linux/major.h>
>  #include <linux/fs.h>
>  #include <linux/platform_device.h>
> diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop331-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop331-setup.c
> --- linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop331-setup.c	2006-02-07 11:52:06 +0100
> +++ linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop331-setup.c	2006-02-13 01:15:09 +0100
> @@ -12,7 +12,6 @@
>  #include <linux/mm.h>
>  #include <linux/init.h>
>  #include <linux/config.h>
> -#include <linux/init.h>
>  #include <linux/major.h>
>  #include <linux/fs.h>
>  #include <linux/platform_device.h>
> diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/plat-omap/pm.c linux-2.6.16-rc2-mpf/arch/arm/plat-omap/pm.c
> --- linux-2.6.16-rc2/arch/arm/plat-omap/pm.c	2006-01-03 17:29:08 +0100
> +++ linux-2.6.16-rc2-mpf/arch/arm/plat-omap/pm.c	2006-02-13 01:15:24 +0100
> @@ -38,7 +38,6 @@
>  #include <linux/pm.h>
>  #include <linux/sched.h>
>  #include <linux/proc_fs.h>
> -#include <linux/pm.h>
>  #include <linux/interrupt.h>
>  
>  #include <asm/io.h>
> diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/s3c2410fb.c linux-2.6.16-rc2-mpf/drivers/video/s3c2410fb.c
> --- linux-2.6.16-rc2/drivers/video/s3c2410fb.c	2006-02-07 11:52:57 +0100
> +++ linux-2.6.16-rc2-mpf/drivers/video/s3c2410fb.c	2006-02-13 01:38:19 +0100
> @@ -82,7 +82,6 @@
>  #include <linux/fb.h>
>  #include <linux/init.h>
>  #include <linux/dma-mapping.h>
> -#include <linux/string.h>
>  #include <linux/interrupt.h>
>  #include <linux/workqueue.h>
>  #include <linux/wait.h>

Thanks, I've applied just the above bits of the patch.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] remove duplicate #includes
  2006-02-14 21:21   ` Andrew Morton
@ 2006-02-15  9:52     ` Herbert Poetzl
  0 siblings, 0 replies; 10+ messages in thread
From: Herbert Poetzl @ 2006-02-15  9:52 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Jean Delvare, linux-kernel

On Tue, Feb 14, 2006 at 01:21:33PM -0800, Andrew Morton wrote:
> Jean Delvare <khali@linux-fr.org> wrote:
> >
> > Hi Herbert,
> > 
> > > recently I stumbled over a few files which #include the 
> > > same .h file twice -- sometimes even in the immediately
> > > following line. so I thought I'd look into that to reduce 
> > > the amount of duplicate includes in the kernel ...
> > > (...)
> > > diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c
> > > --- linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c	2006-02-07 11:52:31 +0100
> > > +++ linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c	2006-02-13 02:07:58 +0100
> > > @@ -104,7 +104,6 @@
> > >  #include <linux/kernel.h>
> > >  #include <linux/delay.h>
> > >  #include <linux/sched.h>
> > > -#include <linux/i2c.h>
> > >  #include <linux/slab.h>
> > >  #include <linux/init.h>
> > >  #include <linux/spinlock.h>
> > 
> > This one was already taken care of in a different patch:
> > 
> > http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc3/2.6.16-rc3-mm1/broken-out/macintosh-cleanup-the-use-of-i2c-headers.patch
> > 
> > So please exclude this part from your patch so as to avoid collisions.
> > 
> 
> Is OK. I'll stage the big cleanup patches like this after everyone
> else's patches, so all that is left in this patch is stuff which
> doesn't intersect with anyone else's work.
>
> That's one of the advantages of having everyone's development trees
> all in one place. (And people who run development trees which aren't
> in -mm lose).

okay, after Arthurs input regarding the script, I'll
investigate this a little more and come up with a more
detailed list of duplicate includes, maybe categorized
by type of duplicate inclusion direct/indirect and by
subsystem/architecture if that is desired?

any input here would be appreciated, even if it just
is something like: "hey, we do not want this kind of
cleanup done in the kernel" ...

best,
Herbert


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] remove duplicate #includes
  2006-02-14 15:50 ` Arthur Othieno
@ 2006-02-15  9:48   ` Herbert Poetzl
  0 siblings, 0 replies; 10+ messages in thread
From: Herbert Poetzl @ 2006-02-15  9:48 UTC (permalink / raw)
  To: Arthur Othieno; +Cc: Andrew Morton, Linux Kernel ML

On Tue, Feb 14, 2006 at 10:50:57AM -0500, Arthur Othieno wrote:
> On Mon, Feb 13, 2006 at 10:39:59AM +0100, Herbert Poetzl wrote:
> > 
> > Hi Andrew! Folks!
> > 
> > recently I stumbled over a few files which #include the 
> > same .h file twice -- sometimes even in the immediately
> > following line. so I thought I'd look into that to reduce 
> > the amount of duplicate includes in the kernel ...
> > 
> > I first searched for 'potential' duplicates with the
> > following command sequence ...
> > 
> >   find . -type f -name '*.[hcS]' -exec gawk '/^#include/ { X[$2]++ } END { for (n in X) if (X[n]>1) printf("%s: %s[%d]\n",FILENAME,n,X[n]); }' {} \;
> 
> scripts/checkincludes.pl ;-)

darn! I knew it was there, but I could not remember
where I saw it! thanks for the hint with the cluebat

> > .. then, I inspected each of the results, and if it was
> > valid, I removed every but the first occurence (of course 
> > only after detailed inspection)
> >
> > I will do a bunch of further tests with this patch to
> > make absolutely 100% sure that there are no bad changes.
> > the patch contains the obvious cases first, and the not
> > so obvious ones at the end.
> 
> Please, please, split this into smaller, readable chunks. As is, it is
> bound to break patches queued up in -mm and other subsystem trees. You
> don't want the angry mob coming after you, really.

okay, maybe a good idea .. for now it was just to
get an idea how many worms are in this can :)

thanks,
Herbert

> [snip]
> 
> > --- linux-2.6.16-rc2/arch/parisc/kernel/signal.c	2006-01-03 17:29:13 +0100
> > +++ linux-2.6.16-rc2-mpf/arch/parisc/kernel/signal.c	2006-02-13 01:24:26 +0100
> > @@ -24,7 +24,6 @@
> >  #include <linux/ptrace.h>
> >  #include <linux/unistd.h>
> >  #include <linux/stddef.h>
> > -#include <linux/compat.h>
> 
> Second occurrence is the redundant one here; include/linux/compat.h
> already wrapped around #ifdef CONFIG_COMPAT ..
> 
> >  #include <linux/elf.h>
> >  #include <linux/personality.h>
> >  #include <asm/ucontext.h>
> 
> [snip]
> 
> > diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c
> > --- linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c	2006-02-07 11:52:12 +0100
> > +++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c	2006-02-13 01:35:28 +0100
> > @@ -76,7 +76,6 @@
> >  #include <asm/smu.h>
> >  #include <asm/pmc.h>
> >  #include <asm/lmb.h>
> > -#include <asm/udbg.h>
> 
> You broke CONFIG_PPC_PMAC when CONFIG_PPC64=n
> 
> >  #include "pmac.h"
> >  
> 
> [snip]
> 
> > diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h
> > --- linux-2.6.16-rc2/drivers/char/drm/drm.h	2006-02-07 11:52:24 +0100
> > +++ linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h	2006-02-13 01:48:55 +0100
> > @@ -51,11 +51,9 @@
> >  #if defined(__FreeBSD__) && defined(IN_MODULE)
> >  /* Prevent name collision when including sys/ioccom.h */
> >  #undef ioctl
> > -#include <sys/ioccom.h>
> >  #define ioctl(a,b,c)		xf86ioctl(a,b,c)
> > -#else
> > -#include <sys/ioccom.h>
> >  #endif				/* __FreeBSD__ && xf86ioctl */
> > +#include <sys/ioccom.h>
> 
> This changes semantics, like Bastian pointed out..
> 
> >  #define DRM_IOCTL_NR(n)		((n) & 0xff)
> >  #define DRM_IOC_VOID		IOC_VOID
> >  #define DRM_IOC_READ		IOC_OUT

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] remove duplicate #includes
  2006-02-14 21:03 ` Jean Delvare
@ 2006-02-14 21:21   ` Andrew Morton
  2006-02-15  9:52     ` Herbert Poetzl
  0 siblings, 1 reply; 10+ messages in thread
From: Andrew Morton @ 2006-02-14 21:21 UTC (permalink / raw)
  To: Jean Delvare; +Cc: herbert, linux-kernel

Jean Delvare <khali@linux-fr.org> wrote:
>
> Hi Herbert,
> 
> > recently I stumbled over a few files which #include the 
> > same .h file twice -- sometimes even in the immediately
> > following line. so I thought I'd look into that to reduce 
> > the amount of duplicate includes in the kernel ...
> > (...)
> > diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c
> > --- linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c	2006-02-07 11:52:31 +0100
> > +++ linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c	2006-02-13 02:07:58 +0100
> > @@ -104,7 +104,6 @@
> >  #include <linux/kernel.h>
> >  #include <linux/delay.h>
> >  #include <linux/sched.h>
> > -#include <linux/i2c.h>
> >  #include <linux/slab.h>
> >  #include <linux/init.h>
> >  #include <linux/spinlock.h>
> 
> This one was already taken care of in a different patch:
> 
> http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc3/2.6.16-rc3-mm1/broken-out/macintosh-cleanup-the-use-of-i2c-headers.patch
> 
> So please exclude this part from your patch so as to avoid collisions.
> 

Is OK.  I'll stage the big cleanup patches like this after everyone else's
patches, so all that is left in this patch is stuff which doesn't intersect
with anyone else's work.

That's one of the advantages of having everyone's development trees all in
one place.  (And people who run development trees which aren't in -mm lose).

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] remove duplicate #includes
  2006-02-13  9:39 [PATCH] remove duplicate #includes Herbert Poetzl
  2006-02-13 10:26 ` Bastian Blank
  2006-02-14 15:50 ` Arthur Othieno
@ 2006-02-14 21:03 ` Jean Delvare
  2006-02-14 21:21   ` Andrew Morton
  2006-02-15 10:12 ` Russell King
  3 siblings, 1 reply; 10+ messages in thread
From: Jean Delvare @ 2006-02-14 21:03 UTC (permalink / raw)
  To: Herbert Poetzl; +Cc: Andrew Morton, linux-kernel

Hi Herbert,

> recently I stumbled over a few files which #include the 
> same .h file twice -- sometimes even in the immediately
> following line. so I thought I'd look into that to reduce 
> the amount of duplicate includes in the kernel ...
> (...)
> diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c
> --- linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c	2006-02-07 11:52:31 +0100
> +++ linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c	2006-02-13 02:07:58 +0100
> @@ -104,7 +104,6 @@
>  #include <linux/kernel.h>
>  #include <linux/delay.h>
>  #include <linux/sched.h>
> -#include <linux/i2c.h>
>  #include <linux/slab.h>
>  #include <linux/init.h>
>  #include <linux/spinlock.h>

This one was already taken care of in a different patch:

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc3/2.6.16-rc3-mm1/broken-out/macintosh-cleanup-the-use-of-i2c-headers.patch

So please exclude this part from your patch so as to avoid collisions.

Thanks,
-- 
Jean Delvare

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] remove duplicate #includes
  2006-02-13  9:39 [PATCH] remove duplicate #includes Herbert Poetzl
  2006-02-13 10:26 ` Bastian Blank
@ 2006-02-14 15:50 ` Arthur Othieno
  2006-02-15  9:48   ` Herbert Poetzl
  2006-02-14 21:03 ` Jean Delvare
  2006-02-15 10:12 ` Russell King
  3 siblings, 1 reply; 10+ messages in thread
From: Arthur Othieno @ 2006-02-14 15:50 UTC (permalink / raw)
  To: Herbert Poetzl; +Cc: Andrew Morton, Linux Kernel ML

On Mon, Feb 13, 2006 at 10:39:59AM +0100, Herbert Poetzl wrote:
> 
> Hi Andrew! Folks!
> 
> recently I stumbled over a few files which #include the 
> same .h file twice -- sometimes even in the immediately
> following line. so I thought I'd look into that to reduce 
> the amount of duplicate includes in the kernel ...
> 
> I first searched for 'potential' duplicates with the
> following command sequence ...
> 
>   find . -type f -name '*.[hcS]' -exec gawk '/^#include/ { X[$2]++ } END { for (n in X) if (X[n]>1) printf("%s: %s[%d]\n",FILENAME,n,X[n]); }' {} \;

scripts/checkincludes.pl ;-)

> .. then, I inspected each of the results, and if it was
> valid, I removed every but the first occurence (of course 
> only after detailed inspection)
>
> I will do a bunch of further tests with this patch to
> make absolutely 100% sure that there are no bad changes.
> the patch contains the obvious cases first, and the not
> so obvious ones at the end.

Please, please, split this into smaller, readable chunks. As is, it is
bound to break patches queued up in -mm and other subsystem trees. You
don't want the angry mob coming after you, really.

[snip]

> --- linux-2.6.16-rc2/arch/parisc/kernel/signal.c	2006-01-03 17:29:13 +0100
> +++ linux-2.6.16-rc2-mpf/arch/parisc/kernel/signal.c	2006-02-13 01:24:26 +0100
> @@ -24,7 +24,6 @@
>  #include <linux/ptrace.h>
>  #include <linux/unistd.h>
>  #include <linux/stddef.h>
> -#include <linux/compat.h>

Second occurrence is the redundant one here; include/linux/compat.h
already wrapped around #ifdef CONFIG_COMPAT ..

>  #include <linux/elf.h>
>  #include <linux/personality.h>
>  #include <asm/ucontext.h>

[snip]

> diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c
> --- linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c	2006-02-07 11:52:12 +0100
> +++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c	2006-02-13 01:35:28 +0100
> @@ -76,7 +76,6 @@
>  #include <asm/smu.h>
>  #include <asm/pmc.h>
>  #include <asm/lmb.h>
> -#include <asm/udbg.h>

You broke CONFIG_PPC_PMAC when CONFIG_PPC64=n

>  #include "pmac.h"
>  

[snip]

> diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h
> --- linux-2.6.16-rc2/drivers/char/drm/drm.h	2006-02-07 11:52:24 +0100
> +++ linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h	2006-02-13 01:48:55 +0100
> @@ -51,11 +51,9 @@
>  #if defined(__FreeBSD__) && defined(IN_MODULE)
>  /* Prevent name collision when including sys/ioccom.h */
>  #undef ioctl
> -#include <sys/ioccom.h>
>  #define ioctl(a,b,c)		xf86ioctl(a,b,c)
> -#else
> -#include <sys/ioccom.h>
>  #endif				/* __FreeBSD__ && xf86ioctl */
> +#include <sys/ioccom.h>

This changes semantics, like Bastian pointed out..

>  #define DRM_IOCTL_NR(n)		((n) & 0xff)
>  #define DRM_IOC_VOID		IOC_VOID
>  #define DRM_IOC_READ		IOC_OUT

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] remove duplicate #includes
  2006-02-13 10:26 ` Bastian Blank
@ 2006-02-13 15:01   ` Herbert Poetzl
  0 siblings, 0 replies; 10+ messages in thread
From: Herbert Poetzl @ 2006-02-13 15:01 UTC (permalink / raw)
  To: Andrew Morton, Linux Kernel ML

On Mon, Feb 13, 2006 at 11:26:56AM +0100, Bastian Blank wrote:
> On Mon, Feb 13, 2006 at 10:39:59AM +0100, Herbert Poetzl wrote:
> > diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h
> > --- linux-2.6.16-rc2/drivers/char/drm/drm.h	2006-02-07 11:52:24 +0100
> > +++ linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h	2006-02-13 01:48:55 +0100
> > @@ -51,11 +51,9 @@
> >  #if defined(__FreeBSD__) && defined(IN_MODULE)
> >  /* Prevent name collision when including sys/ioccom.h */
> >  #undef ioctl
> > -#include <sys/ioccom.h>
> >  #define ioctl(a,b,c)		xf86ioctl(a,b,c)
> > -#else
> > -#include <sys/ioccom.h>
> >  #endif				/* __FreeBSD__ && xf86ioctl */
> > +#include <sys/ioccom.h>
> >  #define DRM_IOCTL_NR(n)		((n) & 0xff)
> >  #define DRM_IOC_VOID		IOC_VOID
> >  #define DRM_IOC_READ		IOC_OUT
> 
> This one changes the behaviour. 

hmm, yes, doesn't make much sense to remove that 
dumplicate entry anyway, so I'll simply drop that
one from the patch ... 

thanks a lot for the feedback!

> But do we want to have this non-linux hacks in the tree?

good question

best,
Herbert

> Bastian
> 
> -- 
> It would be illogical to assume that all conditions remain stable.
> 		-- Spock, "The Enterprise Incident", stardate 5027.3



^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] remove duplicate #includes
  2006-02-13  9:39 [PATCH] remove duplicate #includes Herbert Poetzl
@ 2006-02-13 10:26 ` Bastian Blank
  2006-02-13 15:01   ` Herbert Poetzl
  2006-02-14 15:50 ` Arthur Othieno
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 10+ messages in thread
From: Bastian Blank @ 2006-02-13 10:26 UTC (permalink / raw)
  To: Andrew Morton, Linux Kernel ML

[-- Attachment #1: Type: text/plain, Size: 1003 bytes --]

On Mon, Feb 13, 2006 at 10:39:59AM +0100, Herbert Poetzl wrote:
> diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h
> --- linux-2.6.16-rc2/drivers/char/drm/drm.h	2006-02-07 11:52:24 +0100
> +++ linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h	2006-02-13 01:48:55 +0100
> @@ -51,11 +51,9 @@
>  #if defined(__FreeBSD__) && defined(IN_MODULE)
>  /* Prevent name collision when including sys/ioccom.h */
>  #undef ioctl
> -#include <sys/ioccom.h>
>  #define ioctl(a,b,c)		xf86ioctl(a,b,c)
> -#else
> -#include <sys/ioccom.h>
>  #endif				/* __FreeBSD__ && xf86ioctl */
> +#include <sys/ioccom.h>
>  #define DRM_IOCTL_NR(n)		((n) & 0xff)
>  #define DRM_IOC_VOID		IOC_VOID
>  #define DRM_IOC_READ		IOC_OUT

This one changes the behaviour. But do we want to have this non-linux
hacks in the tree?

Bastian

-- 
It would be illogical to assume that all conditions remain stable.
		-- Spock, "The Enterprise Incident", stardate 5027.3

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH] remove duplicate #includes
@ 2006-02-13  9:39 Herbert Poetzl
  2006-02-13 10:26 ` Bastian Blank
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Herbert Poetzl @ 2006-02-13  9:39 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Linux Kernel ML


Hi Andrew! Folks!

recently I stumbled over a few files which #include the 
same .h file twice -- sometimes even in the immediately
following line. so I thought I'd look into that to reduce 
the amount of duplicate includes in the kernel ...

I first searched for 'potential' duplicates with the
following command sequence ...

  find . -type f -name '*.[hcS]' -exec gawk '/^#include/ { X[$2]++ } END { for (n in X) if (X[n]>1) printf("%s: %s[%d]\n",FILENAME,n,X[n]); }' {} \;

.. then, I inspected each of the results, and if it was
valid, I removed every but the first occurence (of course 
only after detailed inspection)

I will do a bunch of further tests with this patch to
make absolutely 100% sure that there are no bad changes.
the patch contains the obvious cases first, and the not
so obvious ones at the end.

best,
Herbert


Signed-off-by: Herbert Pötzl <herbert@13thfloor.at>
---
diff -NurpP --minimal linux-2.6.16-rc2/arch/alpha/kernel/setup.c linux-2.6.16-rc2-mpf/arch/alpha/kernel/setup.c
--- linux-2.6.16-rc2/arch/alpha/kernel/setup.c	2005-06-22 02:37:51 +0200
+++ linux-2.6.16-rc2-mpf/arch/alpha/kernel/setup.c	2006-02-13 01:23:59 +0100
@@ -55,7 +55,6 @@ static struct notifier_block alpha_panic
 #include <asm/system.h>
 #include <asm/hwrpb.h>
 #include <asm/dma.h>
-#include <asm/io.h>
 #include <asm/mmu_context.h>
 #include <asm/console.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop321-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop321-setup.c
--- linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop321-setup.c	2006-02-07 11:52:06 +0100
+++ linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop321-setup.c	2006-02-13 01:14:57 +0100
@@ -13,7 +13,6 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/config.h>
-#include <linux/init.h>
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop331-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop331-setup.c
--- linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop331-setup.c	2006-02-07 11:52:06 +0100
+++ linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop331-setup.c	2006-02-13 01:15:09 +0100
@@ -12,7 +12,6 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/config.h>
-#include <linux/init.h>
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/platform_device.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/plat-omap/pm.c linux-2.6.16-rc2-mpf/arch/arm/plat-omap/pm.c
--- linux-2.6.16-rc2/arch/arm/plat-omap/pm.c	2006-01-03 17:29:08 +0100
+++ linux-2.6.16-rc2-mpf/arch/arm/plat-omap/pm.c	2006-02-13 01:15:24 +0100
@@ -38,7 +38,6 @@
 #include <linux/pm.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
 #include <linux/interrupt.h>
 
 #include <asm/io.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/arm26/kernel/armksyms.c linux-2.6.16-rc2-mpf/arch/arm26/kernel/armksyms.c
--- linux-2.6.16-rc2/arch/arm26/kernel/armksyms.c	2006-02-07 11:52:07 +0100
+++ linux-2.6.16-rc2-mpf/arch/arm26/kernel/armksyms.c	2006-02-13 01:21:41 +0100
@@ -9,7 +9,6 @@
  */
 #include <linux/module.h>
 #include <linux/config.h>
-#include <linux/module.h>
 #include <linux/user.h>
 #include <linux/string.h>
 #include <linux/fs.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/cris/arch-v32/mm/init.c linux-2.6.16-rc2-mpf/arch/cris/arch-v32/mm/init.c
--- linux-2.6.16-rc2/arch/cris/arch-v32/mm/init.c	2005-08-29 22:24:51 +0200
+++ linux-2.6.16-rc2-mpf/arch/cris/arch-v32/mm/init.c	2006-02-13 01:21:29 +0100
@@ -11,7 +11,6 @@
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/mm.h>
-#include <linux/config.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/types.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/i386/kernel/cpuid.c linux-2.6.16-rc2-mpf/arch/i386/kernel/cpuid.c
--- linux-2.6.16-rc2/arch/i386/kernel/cpuid.c	2006-02-07 11:52:08 +0100
+++ linux-2.6.16-rc2-mpf/arch/i386/kernel/cpuid.c	2006-02-13 01:14:41 +0100
@@ -35,7 +35,6 @@
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/smp_lock.h>
-#include <linux/fs.h>
 #include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/notifier.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/ia32/ia32priv.h linux-2.6.16-rc2-mpf/arch/ia64/ia32/ia32priv.h
--- linux-2.6.16-rc2/arch/ia64/ia32/ia32priv.h	2006-01-03 17:29:09 +0100
+++ linux-2.6.16-rc2-mpf/arch/ia64/ia32/ia32priv.h	2006-02-13 01:23:38 +0100
@@ -291,7 +291,6 @@ struct old_linux32_dirent {
 #define _ASM_IA64_ELF_H		/* Don't include elf.h */
 
 #include <linux/sched.h>
-#include <asm/processor.h>
 
 /*
  * This is used to ensure we don't load something for the wrong architecture.
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/ia32/sys_ia32.c linux-2.6.16-rc2-mpf/arch/ia64/ia32/sys_ia32.c
--- linux-2.6.16-rc2/arch/ia64/ia32/sys_ia32.c	2006-02-07 11:52:08 +0100
+++ linux-2.6.16-rc2-mpf/arch/ia64/ia32/sys_ia32.c	2006-02-13 01:22:43 +0100
@@ -36,7 +36,6 @@
 #include <linux/uio.h>
 #include <linux/nfs_fs.h>
 #include <linux/quota.h>
-#include <linux/syscalls.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/cache.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/kernel/setup.c linux-2.6.16-rc2-mpf/arch/ia64/kernel/setup.c
--- linux-2.6.16-rc2/arch/ia64/kernel/setup.c	2006-02-07 11:52:08 +0100
+++ linux-2.6.16-rc2-mpf/arch/ia64/kernel/setup.c	2006-02-13 01:21:56 +0100
@@ -60,7 +60,6 @@
 #include <asm/smp.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
-#include <asm/system.h>
 
 #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
 # error "struct cpuinfo_ia64 too big!"
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/kernel/time.c linux-2.6.16-rc2-mpf/arch/ia64/kernel/time.c
--- linux-2.6.16-rc2/arch/ia64/kernel/time.c	2006-01-03 17:29:09 +0100
+++ linux-2.6.16-rc2-mpf/arch/ia64/kernel/time.c	2006-02-13 01:22:11 +0100
@@ -19,7 +19,6 @@
 #include <linux/time.h>
 #include <linux/interrupt.h>
 #include <linux/efi.h>
-#include <linux/profile.h>
 #include <linux/timex.h>
 
 #include <asm/machvec.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/sn/kernel/setup.c linux-2.6.16-rc2-mpf/arch/ia64/sn/kernel/setup.c
--- linux-2.6.16-rc2/arch/ia64/sn/kernel/setup.c	2006-01-03 17:29:09 +0100
+++ linux-2.6.16-rc2-mpf/arch/ia64/sn/kernel/setup.c	2006-02-13 01:22:27 +0100
@@ -26,7 +26,6 @@
 #include <linux/interrupt.h>
 #include <linux/acpi.h>
 #include <linux/compiler.h>
-#include <linux/sched.h>
 #include <linux/root_dev.h>
 #include <linux/nodemask.h>
 #include <linux/pm.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/m68knommu/platform/5206e/config.c linux-2.6.16-rc2-mpf/arch/m68knommu/platform/5206e/config.c
--- linux-2.6.16-rc2/arch/m68knommu/platform/5206e/config.c	2004-12-25 01:54:45 +0100
+++ linux-2.6.16-rc2-mpf/arch/m68knommu/platform/5206e/config.c	2006-02-13 01:19:07 +0100
@@ -21,7 +21,6 @@
 #include <asm/mcftimer.h>
 #include <asm/mcfsim.h>
 #include <asm/mcfdma.h>
-#include <asm/irq.h>
 
 /***************************************************************************/
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/kernel/signal_n32.c linux-2.6.16-rc2-mpf/arch/mips/kernel/signal_n32.c
--- linux-2.6.16-rc2/arch/mips/kernel/signal_n32.c	2006-01-03 17:29:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/mips/kernel/signal_n32.c	2006-02-13 01:15:39 +0100
@@ -17,7 +17,6 @@
  */
 #include <linux/cache.h>
 #include <linux/sched.h>
-#include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/mips-boards/generic/time.c linux-2.6.16-rc2-mpf/arch/mips/mips-boards/generic/time.c
--- linux-2.6.16-rc2/arch/mips/mips-boards/generic/time.c	2006-02-07 11:52:10 +0100
+++ linux-2.6.16-rc2-mpf/arch/mips/mips-boards/generic/time.c	2006-02-13 01:17:20 +0100
@@ -42,7 +42,6 @@
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
 #include <asm/mips-boards/maltaint.h>
-#include <asm/mc146818-time.h>
 
 unsigned long cpu_khz;
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/mips-boards/sim/sim_time.c linux-2.6.16-rc2-mpf/arch/mips/mips-boards/sim/sim_time.c
--- linux-2.6.16-rc2/arch/mips/mips-boards/sim/sim_time.c	2006-01-03 17:29:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/mips/mips-boards/sim/sim_time.c	2006-02-13 01:18:08 +0100
@@ -15,20 +15,13 @@
 #include <linux/interrupt.h>
 #include <linux/mc146818rtc.h>
 #include <linux/timex.h>
-#include <asm/mipsregs.h>
-#include <asm/ptrace.h>
-#include <asm/hardirq.h>
 #include <asm/irq.h>
-#include <asm/div64.h>
-#include <asm/cpu.h>
-#include <asm/time.h>
 #include <asm/mc146818-time.h>
 #include <asm/msc01_ic.h>
 
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
 #include <asm/mips-boards/simint.h>
-#include <asm/mc146818-time.h>
 #include <asm/smp.h>
 
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/sibyte/bcm1480/time.c linux-2.6.16-rc2-mpf/arch/mips/sibyte/bcm1480/time.c
--- linux-2.6.16-rc2/arch/mips/sibyte/bcm1480/time.c	2006-01-03 17:29:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/mips/sibyte/bcm1480/time.c	2006-02-13 01:18:35 +0100
@@ -99,8 +99,6 @@ void bcm1480_time_init(void)
 	 */
 }
 
-#include <asm/sibyte/sb1250.h>
-
 void bcm1480_timer_interrupt(struct pt_regs *regs)
 {
 	int cpu = smp_processor_id();
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/tx4938/common/setup.c linux-2.6.16-rc2-mpf/arch/mips/tx4938/common/setup.c
--- linux-2.6.16-rc2/arch/mips/tx4938/common/setup.c	2006-01-03 17:29:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/mips/tx4938/common/setup.c	2006-02-13 01:18:48 +0100
@@ -31,7 +31,6 @@
 #include <asm/mipsregs.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/time.h>
 #include <asm/tx4938/rbtx4938.h>
 
 extern void toshiba_rbtx4938_setup(void);
diff -NurpP --minimal linux-2.6.16-rc2/arch/parisc/kernel/signal.c linux-2.6.16-rc2-mpf/arch/parisc/kernel/signal.c
--- linux-2.6.16-rc2/arch/parisc/kernel/signal.c	2006-01-03 17:29:13 +0100
+++ linux-2.6.16-rc2-mpf/arch/parisc/kernel/signal.c	2006-02-13 01:24:26 +0100
@@ -24,7 +24,6 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
-#include <linux/compat.h>
 #include <linux/elf.h>
 #include <linux/personality.h>
 #include <asm/ucontext.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/kernel/btext.c linux-2.6.16-rc2-mpf/arch/powerpc/kernel/btext.c
--- linux-2.6.16-rc2/arch/powerpc/kernel/btext.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/kernel/btext.c	2006-02-13 01:30:41 +0100
@@ -12,7 +12,6 @@
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/btext.h>
-#include <asm/prom.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/kernel/iommu.c linux-2.6.16-rc2-mpf/arch/powerpc/kernel/iommu.c
--- linux-2.6.16-rc2/arch/powerpc/kernel/iommu.c	2006-01-03 17:29:13 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/kernel/iommu.c	2006-02-13 01:30:57 +0100
@@ -32,7 +32,6 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/dma-mapping.h>
-#include <linux/init.h>
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/prom.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/kernel/time.c linux-2.6.16-rc2-mpf/arch/powerpc/kernel/time.c
--- linux-2.6.16-rc2/arch/powerpc/kernel/time.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/kernel/time.c	2006-02-13 01:31:44 +0100
@@ -70,7 +70,6 @@
 #include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_call_xm.h>
 #endif
-#include <asm/smp.h>
 
 /* keep track of when we need to update the rtc */
 time_t last_rtc_update;
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/mm/hash_utils_64.c linux-2.6.16-rc2-mpf/arch/powerpc/mm/hash_utils_64.c
--- linux-2.6.16-rc2/arch/powerpc/mm/hash_utils_64.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/mm/hash_utils_64.c	2006-02-13 01:32:00 +0100
@@ -50,7 +50,6 @@
 #include <asm/tlb.h>
 #include <asm/cacheflush.h>
 #include <asm/cputable.h>
-#include <asm/abs_addr.h>
 #include <asm/sections.h>
 
 #ifdef DEBUG
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/mm/hugetlbpage.c linux-2.6.16-rc2-mpf/arch/powerpc/mm/hugetlbpage.c
--- linux-2.6.16-rc2/arch/powerpc/mm/hugetlbpage.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/mm/hugetlbpage.c	2006-02-13 01:32:36 +0100
@@ -23,9 +23,6 @@
 #include <asm/mmu_context.h>
 #include <asm/machdep.h>
 #include <asm/cputable.h>
-#include <asm/tlb.h>
-
-#include <linux/sysctl.h>
 
 #define NUM_LOW_AREAS	(0x100000000UL >> SID_SHIFT)
 #define NUM_HIGH_AREAS	(PGTABLE_RANGE >> HTLB_AREA_SHIFT)
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/mm/init_32.c linux-2.6.16-rc2-mpf/arch/powerpc/mm/init_32.c
--- linux-2.6.16-rc2/arch/powerpc/mm/init_32.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/mm/init_32.c	2006-02-13 01:32:50 +0100
@@ -43,7 +43,6 @@
 #include <asm/machdep.h>
 #include <asm/btext.h>
 #include <asm/tlb.h>
-#include <asm/prom.h>
 #include <asm/lmb.h>
 #include <asm/sections.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/mm/mem.c linux-2.6.16-rc2-mpf/arch/powerpc/mm/mem.c
--- linux-2.6.16-rc2/arch/powerpc/mm/mem.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/mm/mem.c	2006-02-13 01:33:04 +0100
@@ -43,7 +43,6 @@
 #include <asm/machdep.h>
 #include <asm/btext.h>
 #include <asm/tlb.h>
-#include <asm/prom.h>
 #include <asm/lmb.h>
 #include <asm/sections.h>
 #include <asm/vdso.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/cell/iommu.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/cell/iommu.c
--- linux-2.6.16-rc2/arch/powerpc/platforms/cell/iommu.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/cell/iommu.c	2006-02-13 01:33:19 +0100
@@ -29,7 +29,6 @@
 #include <linux/bootmem.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
-#include <linux/kernel.h>
 #include <linux/compiler.h>
 
 #include <asm/sections.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/chrp/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/chrp/setup.c
--- linux-2.6.16-rc2/arch/powerpc/platforms/chrp/setup.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/chrp/setup.c	2006-02-13 01:33:33 +0100
@@ -36,7 +36,6 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
-#include <linux/module.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/chrp/smp.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/chrp/smp.c
--- linux-2.6.16-rc2/arch/powerpc/platforms/chrp/smp.c	2006-01-03 17:29:13 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/chrp/smp.c	2006-02-13 01:33:51 +0100
@@ -32,7 +32,6 @@
 #include <asm/time.h>
 #include <asm/open_pic.h>
 #include <asm/machdep.h>
-#include <asm/smp.h>
 #include <asm/mpic.h>
 #include <asm/rtas.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/iseries/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/iseries/setup.c
--- linux-2.6.16-rc2/arch/powerpc/platforms/iseries/setup.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/iseries/setup.c	2006-02-13 01:34:07 +0100
@@ -43,7 +43,6 @@
 #include <asm/time.h>
 #include <asm/paca.h>
 #include <asm/cache.h>
-#include <asm/sections.h>
 #include <asm/abs_addr.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call_event.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/low_i2c.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/low_i2c.c
--- linux-2.6.16-rc2/arch/powerpc/platforms/powermac/low_i2c.c	2006-02-07 11:52:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/low_i2c.c	2006-02-13 01:34:26 +0100
@@ -41,7 +41,6 @@
 #include <linux/completion.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/completion.h>
 #include <linux/timer.h>
 #include <asm/keylargo.h>
 #include <asm/uninorth.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c
--- linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c	2006-02-07 11:52:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c	2006-02-13 01:35:28 +0100
@@ -76,7 +76,6 @@
 #include <asm/smu.h>
 #include <asm/pmc.h>
 #include <asm/lmb.h>
-#include <asm/udbg.h>
 
 #include "pmac.h"
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/udbg_adb.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/udbg_adb.c
--- linux-2.6.16-rc2/arch/powerpc/platforms/powermac/udbg_adb.c	2006-02-07 11:52:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/udbg_adb.c	2006-02-13 01:35:45 +0100
@@ -13,7 +13,6 @@
 #include <asm/xmon.h>
 #include <asm/prom.h>
 #include <asm/bootx.h>
-#include <asm/machdep.h>
 #include <asm/errno.h>
 #include <asm/pmac_feature.h>
 #include <asm/processor.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/pseries/lpar.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/pseries/lpar.c
--- linux-2.6.16-rc2/arch/powerpc/platforms/pseries/lpar.c	2006-02-07 11:52:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/platforms/pseries/lpar.c	2006-02-13 01:36:00 +0100
@@ -36,7 +36,6 @@
 #include <asm/tlbflush.h>
 #include <asm/tlb.h>
 #include <asm/prom.h>
-#include <asm/abs_addr.h>
 #include <asm/cputable.h>
 #include <asm/udbg.h>
 #include <asm/smp.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/platforms/85xx/stx_gp3.c linux-2.6.16-rc2-mpf/arch/ppc/platforms/85xx/stx_gp3.c
--- linux-2.6.16-rc2/arch/ppc/platforms/85xx/stx_gp3.c	2006-02-07 11:52:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/ppc/platforms/85xx/stx_gp3.c	2006-02-13 01:12:30 +0100
@@ -53,7 +53,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 -NurpP --minimal linux-2.6.16-rc2/arch/ppc/platforms/chrp_setup.c linux-2.6.16-rc2-mpf/arch/ppc/platforms/chrp_setup.c
--- linux-2.6.16-rc2/arch/ppc/platforms/chrp_setup.c	2006-02-07 11:52:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/ppc/platforms/chrp_setup.c	2006-02-13 01:12:50 +0100
@@ -36,7 +36,6 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
-#include <linux/module.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/syslib/gt64260_pic.c linux-2.6.16-rc2-mpf/arch/ppc/syslib/gt64260_pic.c
--- linux-2.6.16-rc2/arch/ppc/syslib/gt64260_pic.c	2006-01-03 17:29:14 +0100
+++ linux-2.6.16-rc2-mpf/arch/ppc/syslib/gt64260_pic.c	2006-02-13 01:11:03 +0100
@@ -37,7 +37,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 -NurpP --minimal linux-2.6.16-rc2/arch/ppc/syslib/mpc52xx_pic.c linux-2.6.16-rc2-mpf/arch/ppc/syslib/mpc52xx_pic.c
--- linux-2.6.16-rc2/arch/ppc/syslib/mpc52xx_pic.c	2005-06-22 02:37:57 +0200
+++ linux-2.6.16-rc2-mpf/arch/ppc/syslib/mpc52xx_pic.c	2006-02-13 01:12:05 +0100
@@ -22,7 +22,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 -NurpP --minimal linux-2.6.16-rc2/arch/ppc/syslib/mv64360_pic.c linux-2.6.16-rc2-mpf/arch/ppc/syslib/mv64360_pic.c
--- linux-2.6.16-rc2/arch/ppc/syslib/mv64360_pic.c	2006-01-03 17:29:15 +0100
+++ linux-2.6.16-rc2-mpf/arch/ppc/syslib/mv64360_pic.c	2006-02-13 01:11:45 +0100
@@ -38,7 +38,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 -NurpP --minimal linux-2.6.16-rc2/arch/ppc/syslib/ppc83xx_setup.c linux-2.6.16-rc2-mpf/arch/ppc/syslib/ppc83xx_setup.c
--- linux-2.6.16-rc2/arch/ppc/syslib/ppc83xx_setup.c	2006-01-03 17:29:15 +0100
+++ linux-2.6.16-rc2-mpf/arch/ppc/syslib/ppc83xx_setup.c	2006-02-13 01:11:29 +0100
@@ -44,7 +44,6 @@
 
 #include <syslib/ppc83xx_setup.h>
 #if defined(CONFIG_PCI)
-#include <asm/delay.h>
 #include <syslib/ppc83xx_pci.h>
 #endif
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/xmon/start.c linux-2.6.16-rc2-mpf/arch/ppc/xmon/start.c
--- linux-2.6.16-rc2/arch/ppc/xmon/start.c	2006-02-07 11:52:12 +0100
+++ linux-2.6.16-rc2-mpf/arch/ppc/xmon/start.c	2006-02-13 01:13:07 +0100
@@ -16,7 +16,6 @@
 #include <asm/xmon.h>
 #include <asm/prom.h>
 #include <asm/bootx.h>
-#include <asm/machdep.h>
 #include <asm/errno.h>
 #include <asm/processor.h>
 #include <asm/delay.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh/kernel/sh_ksyms.c linux-2.6.16-rc2-mpf/arch/sh/kernel/sh_ksyms.c
--- linux-2.6.16-rc2/arch/sh/kernel/sh_ksyms.c	2006-02-07 11:52:13 +0100
+++ linux-2.6.16-rc2-mpf/arch/sh/kernel/sh_ksyms.c	2006-02-13 01:19:42 +0100
@@ -19,7 +19,6 @@
 #include <asm/delay.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
-#include <asm/checksum.h>
 
 extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 extern struct hw_interrupt_type no_irq_type;
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh/kernel/smp.c linux-2.6.16-rc2-mpf/arch/sh/kernel/smp.c
--- linux-2.6.16-rc2/arch/sh/kernel/smp.c	2006-02-07 11:52:13 +0100
+++ linux-2.6.16-rc2-mpf/arch/sh/kernel/smp.c	2006-02-13 01:20:08 +0100
@@ -22,7 +22,6 @@
 #include <linux/time.h>
 #include <linux/timex.h>
 #include <linux/sched.h>
-#include <linux/module.h>
 
 #include <asm/atomic.h>
 #include <asm/processor.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh64/kernel/setup.c linux-2.6.16-rc2-mpf/arch/sh64/kernel/setup.c
--- linux-2.6.16-rc2/arch/sh64/kernel/setup.c	2005-06-22 02:37:59 +0200
+++ linux-2.6.16-rc2-mpf/arch/sh64/kernel/setup.c	2006-02-13 01:25:19 +0100
@@ -44,7 +44,6 @@
 #include <linux/seq_file.h>
 #include <linux/blkdev.h>
 #include <linux/bootmem.h>
-#include <linux/console.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
 #include <linux/initrd.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh64/kernel/signal.c linux-2.6.16-rc2-mpf/arch/sh64/kernel/signal.c
--- linux-2.6.16-rc2/arch/sh64/kernel/signal.c	2005-10-28 20:49:15 +0200
+++ linux-2.6.16-rc2-mpf/arch/sh64/kernel/signal.c	2006-02-13 01:25:03 +0100
@@ -26,7 +26,6 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
-#include <linux/personality.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh64/kernel/traps.c linux-2.6.16-rc2-mpf/arch/sh64/kernel/traps.c
--- linux-2.6.16-rc2/arch/sh64/kernel/traps.c	2005-06-22 02:37:59 +0200
+++ linux-2.6.16-rc2-mpf/arch/sh64/kernel/traps.c	2006-02-13 01:25:46 +0100
@@ -244,8 +244,6 @@ DO_ERROR(12, SIGILL,  "reserved instruct
 #endif /* CONFIG_SH64_ID2815_WORKAROUND */
 
 
-#include <asm/system.h>
-
 /* Called with interrupts disabled */
 asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs)
 {
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc/kernel/irq.c linux-2.6.16-rc2-mpf/arch/sparc/kernel/irq.c
--- linux-2.6.16-rc2/arch/sparc/kernel/irq.c	2005-03-02 12:38:25 +0100
+++ linux-2.6.16-rc2-mpf/arch/sparc/kernel/irq.c	2006-02-13 01:10:36 +0100
@@ -19,7 +19,6 @@
 #include <linux/linkage.h>
 #include <linux/kernel_stat.h>
 #include <linux/signal.h>
-#include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/random.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/module.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/module.c
--- linux-2.6.16-rc2/arch/sparc64/kernel/module.c	2005-06-22 02:38:00 +0200
+++ linux-2.6.16-rc2-mpf/arch/sparc64/kernel/module.c	2006-02-13 01:14:27 +0100
@@ -11,7 +11,6 @@
 #include <linux/fs.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/vmalloc.h>
 #include <linux/mm.h>
 
 #include <asm/processor.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/process.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/process.c
--- linux-2.6.16-rc2/arch/sparc64/kernel/process.c	2006-02-07 11:52:14 +0100
+++ linux-2.6.16-rc2-mpf/arch/sparc64/kernel/process.c	2006-02-13 01:13:22 +0100
@@ -26,7 +26,6 @@
 #include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
-#include <linux/config.h>
 #include <linux/reboot.h>
 #include <linux/delay.h>
 #include <linux/compat.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/sys_sparc32.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/sys_sparc32.c
--- linux-2.6.16-rc2/arch/sparc64/kernel/sys_sparc32.c	2006-02-07 11:52:16 +0100
+++ linux-2.6.16-rc2-mpf/arch/sparc64/kernel/sys_sparc32.c	2006-02-13 01:14:12 +0100
@@ -54,7 +54,6 @@
 #include <linux/vfs.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/ptrace.h>
-#include <linux/highuid.h>
 
 #include <asm/types.h>
 #include <asm/ipc.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/sys_sunos32.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/sys_sunos32.c
--- linux-2.6.16-rc2/arch/sparc64/kernel/sys_sunos32.c	2006-02-07 11:52:16 +0100
+++ linux-2.6.16-rc2-mpf/arch/sparc64/kernel/sys_sunos32.c	2006-02-13 01:13:58 +0100
@@ -56,7 +56,6 @@
 #include <linux/personality.h>
 
 /* For SOCKET_I */
-#include <linux/socket.h>
 #include <net/sock.h>
 #include <net/compat.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/time.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/time.c
--- linux-2.6.16-rc2/arch/sparc64/kernel/time.c	2006-02-07 11:52:16 +0100
+++ linux-2.6.16-rc2-mpf/arch/sparc64/kernel/time.c	2006-02-13 01:13:37 +0100
@@ -29,7 +29,6 @@
 #include <linux/jiffies.h>
 #include <linux/cpufreq.h>
 #include <linux/percpu.h>
-#include <linux/profile.h>
 
 #include <asm/oplib.h>
 #include <asm/mostek.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/um/kernel/trap_kern.c linux-2.6.16-rc2-mpf/arch/um/kernel/trap_kern.c
--- linux-2.6.16-rc2/arch/um/kernel/trap_kern.c	2006-02-07 11:52:17 +0100
+++ linux-2.6.16-rc2-mpf/arch/um/kernel/trap_kern.c	2006-02-13 01:20:41 +0100
@@ -26,13 +26,11 @@
 #include "mconsole_kern.h"
 #include "mem.h"
 #include "mem_kern.h"
-#include "sysdep/sigcontext.h"
 #include "sysdep/ptrace.h"
 #include "os.h"
 #ifdef CONFIG_MODE_SKAS
 #include "skas.h"
 #endif
-#include "os.h"
 
 /* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */
 int handle_page_fault(unsigned long address, unsigned long ip, 
diff -NurpP --minimal linux-2.6.16-rc2/arch/x86_64/kernel/x8664_ksyms.c linux-2.6.16-rc2-mpf/arch/x86_64/kernel/x8664_ksyms.c
--- linux-2.6.16-rc2/arch/x86_64/kernel/x8664_ksyms.c	2006-02-07 11:52:18 +0100
+++ linux-2.6.16-rc2-mpf/arch/x86_64/kernel/x8664_ksyms.c	2006-02-13 01:26:38 +0100
@@ -30,7 +30,6 @@
 #include <asm/kdebug.h>
 #include <asm/unistd.h>
 #include <asm/tlbflush.h>
-#include <asm/kdebug.h>
 
 extern spinlock_t rtc_lock;
 
diff -NurpP --minimal linux-2.6.16-rc2/arch/x86_64/mm/fault.c linux-2.6.16-rc2-mpf/arch/x86_64/mm/fault.c
--- linux-2.6.16-rc2/arch/x86_64/mm/fault.c	2006-02-07 11:52:18 +0100
+++ linux-2.6.16-rc2-mpf/arch/x86_64/mm/fault.c	2006-02-13 01:27:02 +0100
@@ -33,7 +33,6 @@
 #include <asm/proto.h>
 #include <asm/kdebug.h>
 #include <asm-generic/sections.h>
-#include <asm/kdebug.h>
 
 /* Page fault error code bits */
 #define PF_PROT	(1<<0)		/* or no page found */
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/kernel/align.S linux-2.6.16-rc2-mpf/arch/xtensa/kernel/align.S
--- linux-2.6.16-rc2/arch/xtensa/kernel/align.S	2005-10-28 20:49:18 +0200
+++ linux-2.6.16-rc2-mpf/arch/xtensa/kernel/align.S	2006-02-13 02:26:19 +0100
@@ -17,7 +17,6 @@
 
 #include <linux/linkage.h>
 #include <asm/ptrace.h>
-#include <asm/ptrace.h>
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/kernel/asm-offsets.c linux-2.6.16-rc2-mpf/arch/xtensa/kernel/asm-offsets.c
--- linux-2.6.16-rc2/arch/xtensa/kernel/asm-offsets.c	2005-08-29 22:24:57 +0200
+++ linux-2.6.16-rc2-mpf/arch/xtensa/kernel/asm-offsets.c	2006-02-13 01:28:11 +0100
@@ -19,7 +19,6 @@
 #include <linux/thread_info.h>
 #include <linux/ptrace.h>
 #include <asm/ptrace.h>
-#include <asm/processor.h>
 #include <asm/uaccess.h>
 
 #define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/kernel/vectors.S linux-2.6.16-rc2-mpf/arch/xtensa/kernel/vectors.S
--- linux-2.6.16-rc2/arch/xtensa/kernel/vectors.S	2005-10-28 20:49:18 +0200
+++ linux-2.6.16-rc2-mpf/arch/xtensa/kernel/vectors.S	2006-02-13 02:26:41 +0100
@@ -44,14 +44,12 @@
 
 #include <linux/linkage.h>
 #include <asm/ptrace.h>
-#include <asm/ptrace.h>
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/thread_info.h>
-#include <asm/processor.h>
 
 
 /*
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/mm/init.c linux-2.6.16-rc2-mpf/arch/xtensa/mm/init.c
--- linux-2.6.16-rc2/arch/xtensa/mm/init.c	2005-10-28 20:49:18 +0200
+++ linux-2.6.16-rc2-mpf/arch/xtensa/mm/init.c	2006-02-13 01:29:34 +0100
@@ -34,7 +34,6 @@
 #include <asm/tlbflush.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
-#include <asm/pgtable.h>
 
 
 #define DEBUG 0
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/platform-iss/console.c linux-2.6.16-rc2-mpf/arch/xtensa/platform-iss/console.c
--- linux-2.6.16-rc2/arch/xtensa/platform-iss/console.c	2005-08-29 22:24:57 +0200
+++ linux-2.6.16-rc2-mpf/arch/xtensa/platform-iss/console.c	2006-02-13 01:30:07 +0100
@@ -21,7 +21,6 @@
 #include <linux/param.h>
 #include <linux/serial.h>
 #include <linux/serialP.h>
-#include <linux/console.h>
 
 #include <asm/uaccess.h>
 #include <asm/irq.h>
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/platform-iss/network.c linux-2.6.16-rc2-mpf/arch/xtensa/platform-iss/network.c
--- linux-2.6.16-rc2/arch/xtensa/platform-iss/network.c	2006-01-03 17:29:20 +0100
+++ linux-2.6.16-rc2-mpf/arch/xtensa/platform-iss/network.c	2006-02-13 01:30:22 +0100
@@ -32,7 +32,6 @@
 #include <linux/bootmem.h>
 #include <linux/ethtool.h>
 #include <linux/rtnetlink.h>
-#include <linux/timer.h>
 #include <linux/platform_device.h>
 
 #include <xtensa/simcall.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/atm/lanai.c linux-2.6.16-rc2-mpf/drivers/atm/lanai.c
--- linux-2.6.16-rc2/drivers/atm/lanai.c	2006-01-03 17:29:21 +0100
+++ linux-2.6.16-rc2-mpf/drivers/atm/lanai.c	2006-02-13 02:07:27 +0100
@@ -65,7 +65,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/dma-mapping.h>
 
 /* -------------------- TUNABLE PARAMATERS: */
 
diff -NurpP --minimal linux-2.6.16-rc2/drivers/block/viodasd.c linux-2.6.16-rc2-mpf/drivers/block/viodasd.c
--- linux-2.6.16-rc2/drivers/block/viodasd.c	2006-02-07 11:52:23 +0100
+++ linux-2.6.16-rc2-mpf/drivers/block/viodasd.c	2006-02-13 02:03:04 +0100
@@ -41,7 +41,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/completion.h>
 #include <linux/device.h>
-#include <linux/kernel.h>
 
 #include <asm/uaccess.h>
 #include <asm/vio.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/lcd.c linux-2.6.16-rc2-mpf/drivers/char/lcd.c
--- linux-2.6.16-rc2/drivers/char/lcd.c	2006-01-03 17:29:25 +0100
+++ linux-2.6.16-rc2-mpf/drivers/char/lcd.c	2006-02-13 01:49:29 +0100
@@ -29,7 +29,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <linux/delay.h>
 
 #include "lcd.h"
 
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/ppdev.c linux-2.6.16-rc2-mpf/drivers/char/ppdev.c
--- linux-2.6.16-rc2/drivers/char/ppdev.c	2006-01-03 17:29:26 +0100
+++ linux-2.6.16-rc2-mpf/drivers/char/ppdev.c	2006-02-13 01:49:43 +0100
@@ -68,7 +68,6 @@
 #include <asm/uaccess.h>
 #include <linux/ppdev.h>
 #include <linux/smp_lock.h>
-#include <linux/device.h>
 
 #define PP_VERSION "ppdev: user-space parallel port driver"
 #define CHRDEV "ppdev"
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/synclink.c linux-2.6.16-rc2-mpf/drivers/char/synclink.c
--- linux-2.6.16-rc2/drivers/char/synclink.c	2006-02-07 11:52:25 +0100
+++ linux-2.6.16-rc2-mpf/drivers/char/synclink.c	2006-02-13 01:49:14 +0100
@@ -89,7 +89,6 @@
 #include <linux/init.h>
 #include <asm/serial.h>
 
-#include <linux/delay.h>
 #include <linux/ioctl.h>
 
 #include <asm/system.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/input/gameport/gameport.c linux-2.6.16-rc2-mpf/drivers/input/gameport/gameport.c
--- linux-2.6.16-rc2/drivers/input/gameport/gameport.c	2006-02-07 11:52:30 +0100
+++ linux-2.6.16-rc2-mpf/drivers/input/gameport/gameport.c	2006-02-13 02:07:06 +0100
@@ -21,7 +21,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
-#include <linux/sched.h>	/* HZ */
 
 /*#include <asm/io.h>*/
 
diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c
--- linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c	2006-02-07 11:52:31 +0100
+++ linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c	2006-02-13 02:07:58 +0100
@@ -104,7 +104,6 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/media/video/arv.c linux-2.6.16-rc2-mpf/drivers/media/video/arv.c
--- linux-2.6.16-rc2/drivers/media/video/arv.c	2006-02-07 11:52:32 +0100
+++ linux-2.6.16-rc2-mpf/drivers/media/video/arv.c	2006-02-13 01:38:37 +0100
@@ -25,7 +25,6 @@
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/mtd/chips/jedec_probe.c linux-2.6.16-rc2-mpf/drivers/mtd/chips/jedec_probe.c
--- linux-2.6.16-rc2/drivers/mtd/chips/jedec_probe.c	2006-01-03 17:29:35 +0100
+++ linux-2.6.16-rc2-mpf/drivers/mtd/chips/jedec_probe.c	2006-02-13 01:57:22 +0100
@@ -18,7 +18,6 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
-#include <linux/init.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/mtd/devices/m25p80.c linux-2.6.16-rc2-mpf/drivers/mtd/devices/m25p80.c
--- linux-2.6.16-rc2/drivers/mtd/devices/m25p80.c	2006-02-07 11:52:37 +0100
+++ linux-2.6.16-rc2-mpf/drivers/mtd/devices/m25p80.c	2006-02-13 01:57:05 +0100
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
-#include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/bonding/bond_sysfs.c linux-2.6.16-rc2-mpf/drivers/net/bonding/bond_sysfs.c
--- linux-2.6.16-rc2/drivers/net/bonding/bond_sysfs.c	2006-02-07 11:52:37 +0100
+++ linux-2.6.16-rc2-mpf/drivers/net/bonding/bond_sysfs.c	2006-02-13 01:39:03 +0100
@@ -33,7 +33,6 @@
 #include <linux/inetdevice.h>
 #include <linux/in.h>
 #include <linux/sysfs.h>
-#include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/inet.h>
 #include <linux/rtnetlink.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/fs_enet/fs_enet-main.c linux-2.6.16-rc2-mpf/drivers/net/fs_enet/fs_enet-main.c
--- linux-2.6.16-rc2/drivers/net/fs_enet/fs_enet-main.c	2006-01-03 17:29:37 +0100
+++ linux-2.6.16-rc2-mpf/drivers/net/fs_enet/fs_enet-main.c	2006-02-13 01:39:21 +0100
@@ -41,8 +41,6 @@
 
 #include <linux/vmalloc.h>
 #include <asm/pgtable.h>
-
-#include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/gianfar.h linux-2.6.16-rc2-mpf/drivers/net/gianfar.h
--- linux-2.6.16-rc2/drivers/net/gianfar.h	2006-02-07 11:52:37 +0100
+++ linux-2.6.16-rc2-mpf/drivers/net/gianfar.h	2006-02-13 01:45:29 +0100
@@ -46,7 +46,6 @@
 #include <linux/crc32.h>
 #include <linux/workqueue.h>
 #include <linux/ethtool.h>
-#include <linux/netdevice.h>
 #include <linux/fsl_devices.h>
 #include "gianfar_mii.h"
 
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/gianfar_ethtool.c linux-2.6.16-rc2-mpf/drivers/net/gianfar_ethtool.c
--- linux-2.6.16-rc2/drivers/net/gianfar_ethtool.c	2006-02-07 11:52:37 +0100
+++ linux-2.6.16-rc2-mpf/drivers/net/gianfar_ethtool.c	2006-02-13 01:45:45 +0100
@@ -36,7 +36,6 @@
 #include <linux/module.h>
 #include <linux/crc32.h>
 #include <asm/types.h>
-#include <asm/uaccess.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/phy.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/mipsnet.c linux-2.6.16-rc2-mpf/drivers/net/mipsnet.c
--- linux-2.6.16-rc2/drivers/net/mipsnet.c	2006-01-03 17:29:40 +0100
+++ linux-2.6.16-rc2-mpf/drivers/net/mipsnet.c	2006-02-13 01:46:01 +0100
@@ -12,7 +12,6 @@
 #include <linux/netdevice.h>
 #include <linux/sched.h>
 #include <linux/etherdevice.h>
-#include <linux/netdevice.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
 #include <asm/mips-boards/simint.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/via-velocity.c linux-2.6.16-rc2-mpf/drivers/net/via-velocity.c
--- linux-2.6.16-rc2/drivers/net/via-velocity.c	2006-02-07 11:52:41 +0100
+++ linux-2.6.16-rc2-mpf/drivers/net/via-velocity.c	2006-02-13 01:43:37 +0100
@@ -65,7 +65,6 @@
 #include <linux/wait.h>
 #include <asm/io.h>
 #include <linux/if.h>
-#include <linux/config.h>
 #include <asm/uaccess.h>
 #include <linux/proc_fs.h>
 #include <linux/inetdevice.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/wireless/ipw2200.h linux-2.6.16-rc2-mpf/drivers/net/wireless/ipw2200.h
--- linux-2.6.16-rc2/drivers/net/wireless/ipw2200.h	2006-02-07 11:52:41 +0100
+++ linux-2.6.16-rc2-mpf/drivers/net/wireless/ipw2200.h	2006-02-13 01:38:49 +0100
@@ -45,7 +45,6 @@
 
 #include <linux/firmware.h>
 #include <linux/wireless.h>
-#include <linux/dma-mapping.h>
 #include <asm/io.h>
 
 #include <net/ieee80211.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/scsi/NCR_D700.c linux-2.6.16-rc2-mpf/drivers/scsi/NCR_D700.c
--- linux-2.6.16-rc2/drivers/scsi/NCR_D700.c	2005-06-22 02:38:23 +0200
+++ linux-2.6.16-rc2-mpf/drivers/scsi/NCR_D700.c	2006-02-13 01:51:56 +0100
@@ -97,7 +97,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mca.h>
-#include <linux/interrupt.h>
 #include <asm/io.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/scsi/seagate.c linux-2.6.16-rc2-mpf/drivers/scsi/seagate.c
--- linux-2.6.16-rc2/drivers/scsi/seagate.c	2006-01-03 17:29:49 +0100
+++ linux-2.6.16-rc2-mpf/drivers/scsi/seagate.c	2006-02-13 01:56:42 +0100
@@ -97,7 +97,6 @@
 #include <linux/delay.h>
 #include <linux/blkdev.h>
 #include <linux/stat.h>
-#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/fbmem.c linux-2.6.16-rc2-mpf/drivers/video/fbmem.c
--- linux-2.6.16-rc2/drivers/video/fbmem.c	2006-02-07 11:52:56 +0100
+++ linux-2.6.16-rc2-mpf/drivers/video/fbmem.c	2006-02-13 01:37:16 +0100
@@ -26,7 +26,6 @@
 #include <linux/mman.h>
 #include <linux/tty.h>
 #include <linux/init.h>
-#include <linux/linux_logo.h>
 #include <linux/proc_fs.h>
 #include <linux/console.h>
 #ifdef CONFIG_KMOD
@@ -34,7 +33,6 @@
 #endif
 #include <linux/devfs_fs_kernel.h>
 #include <linux/err.h>
-#include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/efi.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/s3c2410fb.c linux-2.6.16-rc2-mpf/drivers/video/s3c2410fb.c
--- linux-2.6.16-rc2/drivers/video/s3c2410fb.c	2006-02-07 11:52:57 +0100
+++ linux-2.6.16-rc2-mpf/drivers/video/s3c2410fb.c	2006-02-13 01:38:19 +0100
@@ -82,7 +82,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
-#include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
 #include <linux/wait.h>
diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/tgafb.c linux-2.6.16-rc2-mpf/drivers/video/tgafb.c
--- linux-2.6.16-rc2/drivers/video/tgafb.c	2006-01-03 17:29:55 +0100
+++ linux-2.6.16-rc2-mpf/drivers/video/tgafb.c	2006-02-13 01:37:40 +0100
@@ -26,7 +26,6 @@
 #include <linux/selection.h>
 #include <asm/io.h>
 #include <video/tgafb.h>
-#include <linux/selection.h>
 
 /*
  * Local functions.
diff -NurpP --minimal linux-2.6.16-rc2/drivers/w1/matrox_w1.c linux-2.6.16-rc2-mpf/drivers/w1/matrox_w1.c
--- linux-2.6.16-rc2/drivers/w1/matrox_w1.c	2005-08-29 22:25:30 +0200
+++ linux-2.6.16-rc2-mpf/drivers/w1/matrox_w1.c	2006-02-13 02:07:40 +0100
@@ -33,7 +33,6 @@
 #include <linux/slab.h>
 #include <linux/pci_ids.h>
 #include <linux/pci.h>
-#include <linux/timer.h>
 
 #include "w1.h"
 #include "w1_int.h"
diff -NurpP --minimal linux-2.6.16-rc2/fs/compat_ioctl.c linux-2.6.16-rc2-mpf/fs/compat_ioctl.c
--- linux-2.6.16-rc2/fs/compat_ioctl.c	2006-02-07 11:52:58 +0100
+++ linux-2.6.16-rc2-mpf/fs/compat_ioctl.c	2006-02-13 02:18:27 +0100
@@ -122,7 +122,6 @@
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/video.h>
-#include <linux/lp.h>
 
 /* Aiee. Someone does not find a difference between int and long */
 #define EXT2_IOC32_GETFLAGS               _IOR('f', 1, int)
diff -NurpP --minimal linux-2.6.16-rc2/fs/namei.c linux-2.6.16-rc2-mpf/fs/namei.c
--- linux-2.6.16-rc2/fs/namei.c	2006-02-07 11:53:01 +0100
+++ linux-2.6.16-rc2-mpf/fs/namei.c	2006-02-13 02:17:53 +0100
@@ -31,7 +31,6 @@
 #include <linux/capability.h>
 #include <linux/file.h>
 #include <linux/fcntl.h>
-#include <linux/namei.h>
 #include <asm/namei.h>
 #include <asm/uaccess.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-ia64/pgtable.h linux-2.6.16-rc2-mpf/include/asm-ia64/pgtable.h
--- linux-2.6.16-rc2/include/asm-ia64/pgtable.h	2006-01-03 17:30:05 +0100
+++ linux-2.6.16-rc2-mpf/include/asm-ia64/pgtable.h	2006-02-13 01:04:17 +0100
@@ -154,7 +154,6 @@
 #include <asm/bitops.h>
 #include <asm/cacheflush.h>
 #include <asm/mmu_context.h>
-#include <asm/processor.h>
 
 /*
  * Next come the mappings that determine how mmap() protection bits
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/memory_hotplug.h linux-2.6.16-rc2-mpf/include/linux/memory_hotplug.h
--- linux-2.6.16-rc2/include/linux/memory_hotplug.h	2006-01-03 17:30:09 +0100
+++ linux-2.6.16-rc2-mpf/include/linux/memory_hotplug.h	2006-02-13 01:06:13 +0100
@@ -3,7 +3,6 @@
 
 #include <linux/mmzone.h>
 #include <linux/spinlock.h>
-#include <linux/mmzone.h>
 #include <linux/notifier.h>
 
 #ifdef CONFIG_MEMORY_HOTPLUG
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/nfs_fs.h linux-2.6.16-rc2-mpf/include/linux/nfs_fs.h
--- linux-2.6.16-rc2/include/linux/nfs_fs.h	2006-02-07 11:53:15 +0100
+++ linux-2.6.16-rc2-mpf/include/linux/nfs_fs.h	2006-02-13 01:05:31 +0100
@@ -27,7 +27,6 @@
 #include <linux/nfs3.h>
 #include <linux/nfs4.h>
 #include <linux/nfs_xdr.h>
-#include <linux/rwsem.h>
 #include <linux/mempool.h>
 
 /*
diff -NurpP --minimal linux-2.6.16-rc2/include/net/ieee80211.h linux-2.6.16-rc2-mpf/include/net/ieee80211.h
--- linux-2.6.16-rc2/include/net/ieee80211.h	2006-02-07 11:53:16 +0100
+++ linux-2.6.16-rc2-mpf/include/net/ieee80211.h	2006-02-13 01:07:20 +0100
@@ -177,7 +177,6 @@ const char *escape_essid(const char *ess
 #define IEEE80211_DEBUG_RX(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a)
 #define IEEE80211_DEBUG_QOS(f, a...)  IEEE80211_DEBUG(IEEE80211_DL_QOS, f, ## a)
 #include <linux/netdevice.h>
-#include <linux/wireless.h>
 #include <linux/if_arp.h>	/* ARPHRD_ETHER */
 
 #ifndef WIRELESS_SPY
diff -NurpP --minimal linux-2.6.16-rc2/kernel/kexec.c linux-2.6.16-rc2-mpf/kernel/kexec.c
--- linux-2.6.16-rc2/kernel/kexec.c	2006-02-07 11:53:17 +0100
+++ linux-2.6.16-rc2-mpf/kernel/kexec.c	2006-02-13 02:20:31 +0100
@@ -17,7 +17,6 @@
 #include <linux/highmem.h>
 #include <linux/syscalls.h>
 #include <linux/reboot.h>
-#include <linux/syscalls.h>
 #include <linux/ioport.h>
 #include <linux/hardirq.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/kernel/profile.c linux-2.6.16-rc2-mpf/kernel/profile.c
--- linux-2.6.16-rc2/kernel/profile.c	2005-08-29 22:25:43 +0200
+++ linux-2.6.16-rc2-mpf/kernel/profile.c	2006-02-13 02:20:18 +0100
@@ -21,7 +21,6 @@
 #include <linux/mm.h>
 #include <linux/cpumask.h>
 #include <linux/cpu.h>
-#include <linux/profile.h>
 #include <linux/highmem.h>
 #include <asm/sections.h>
 #include <asm/semaphore.h>
diff -NurpP --minimal linux-2.6.16-rc2/kernel/rcupdate.c linux-2.6.16-rc2-mpf/kernel/rcupdate.c
--- linux-2.6.16-rc2/kernel/rcupdate.c	2006-02-07 11:53:17 +0100
+++ linux-2.6.16-rc2-mpf/kernel/rcupdate.c	2006-02-13 02:19:27 +0100
@@ -45,7 +45,6 @@
 #include <linux/moduleparam.h>
 #include <linux/percpu.h>
 #include <linux/notifier.h>
-#include <linux/rcupdate.h>
 #include <linux/cpu.h>
 
 /* Definition for rcupdate control block. */
diff -NurpP --minimal linux-2.6.16-rc2/kernel/rcutorture.c linux-2.6.16-rc2-mpf/kernel/rcutorture.c
--- linux-2.6.16-rc2/kernel/rcutorture.c	2006-02-07 11:53:17 +0100
+++ linux-2.6.16-rc2-mpf/kernel/rcutorture.c	2006-02-13 02:20:52 +0100
@@ -34,7 +34,6 @@
 #include <linux/sched.h>
 #include <asm/atomic.h>
 #include <linux/bitops.h>
-#include <linux/module.h>
 #include <linux/completion.h>
 #include <linux/moduleparam.h>
 #include <linux/percpu.h>
diff -NurpP --minimal linux-2.6.16-rc2/kernel/sysctl.c linux-2.6.16-rc2-mpf/kernel/sysctl.c
--- linux-2.6.16-rc2/kernel/sysctl.c	2006-02-07 11:53:18 +0100
+++ linux-2.6.16-rc2-mpf/kernel/sysctl.c	2006-02-13 02:19:42 +0100
@@ -28,7 +28,6 @@
 #include <linux/capability.h>
 #include <linux/ctype.h>
 #include <linux/utsname.h>
-#include <linux/capability.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff -NurpP --minimal linux-2.6.16-rc2/kernel/time.c linux-2.6.16-rc2-mpf/kernel/time.c
--- linux-2.6.16-rc2/kernel/time.c	2006-02-07 11:53:18 +0100
+++ linux-2.6.16-rc2-mpf/kernel/time.c	2006-02-13 02:19:57 +0100
@@ -35,7 +35,6 @@
 #include <linux/syscalls.h>
 #include <linux/security.h>
 #include <linux/fs.h>
-#include <linux/module.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
diff -NurpP --minimal linux-2.6.16-rc2/mm/mempolicy.c linux-2.6.16-rc2-mpf/mm/mempolicy.c
--- linux-2.6.16-rc2/mm/mempolicy.c	2006-02-07 11:53:18 +0100
+++ linux-2.6.16-rc2-mpf/mm/mempolicy.c	2006-02-13 02:22:34 +0100
@@ -72,7 +72,6 @@
 #include <linux/hugetlb.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
-#include <linux/mm.h>
 #include <linux/nodemask.h>
 #include <linux/cpuset.h>
 #include <linux/gfp.h>
@@ -82,7 +81,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/compat.h>
-#include <linux/mempolicy.h>
 #include <linux/swap.h>
 #include <linux/seq_file.h>
 #include <linux/proc_fs.h>
diff -NurpP --minimal linux-2.6.16-rc2/mm/swap.c linux-2.6.16-rc2-mpf/mm/swap.c
--- linux-2.6.16-rc2/mm/swap.c	2006-02-07 11:53:18 +0100
+++ linux-2.6.16-rc2-mpf/mm/swap.c	2006-02-13 02:21:52 +0100
@@ -24,12 +24,10 @@
 #include <linux/module.h>
 #include <linux/mm_inline.h>
 #include <linux/buffer_head.h>	/* for try_to_release_page() */
-#include <linux/module.h>
 #include <linux/percpu_counter.h>
 #include <linux/percpu.h>
 #include <linux/cpu.h>
 #include <linux/notifier.h>
-#include <linux/init.h>
 
 /* How many pages do we try to swap or page in/out together? */
 int page_cluster;
diff -NurpP --minimal linux-2.6.16-rc2/net/atm/lec.c linux-2.6.16-rc2-mpf/net/atm/lec.c
--- linux-2.6.16-rc2/net/atm/lec.c	2006-02-07 11:53:21 +0100
+++ linux-2.6.16-rc2-mpf/net/atm/lec.c	2006-02-13 02:15:12 +0100
@@ -22,7 +22,6 @@
 #include <net/dst.h>
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
 /* TokenRing if needed */
diff -NurpP --minimal linux-2.6.16-rc2/net/bridge/netfilter/ebt_log.c linux-2.6.16-rc2-mpf/net/bridge/netfilter/ebt_log.c
--- linux-2.6.16-rc2/net/bridge/netfilter/ebt_log.c	2006-02-07 11:53:22 +0100
+++ linux-2.6.16-rc2-mpf/net/bridge/netfilter/ebt_log.c	2006-02-13 02:14:33 +0100
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/in.h>
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/netfilter_bridge/ebt_log.h>
 #include <linux/netfilter.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/bridge/netfilter/ebt_ulog.c linux-2.6.16-rc2-mpf/net/bridge/netfilter/ebt_ulog.c
--- linux-2.6.16-rc2/net/bridge/netfilter/ebt_ulog.c	2006-02-07 11:53:22 +0100
+++ linux-2.6.16-rc2-mpf/net/bridge/netfilter/ebt_ulog.c	2006-02-13 02:14:51 +0100
@@ -37,7 +37,6 @@
 #include <linux/timer.h>
 #include <linux/netlink.h>
 #include <linux/netdevice.h>
-#include <linux/module.h>
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/netfilter_bridge/ebt_ulog.h>
 #include <net/sock.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv4/ip_output.c linux-2.6.16-rc2-mpf/net/ipv4/ip_output.c
--- linux-2.6.16-rc2/net/ipv4/ip_output.c	2006-02-07 11:53:22 +0100
+++ linux-2.6.16-rc2-mpf/net/ipv4/ip_output.c	2006-02-13 02:09:48 +0100
@@ -76,7 +76,6 @@
 #include <net/icmp.h>
 #include <net/checksum.h>
 #include <net/inetpeer.h>
-#include <net/checksum.h>
 #include <linux/igmp.h>
 #include <linux/netfilter_ipv4.h>
 #include <linux/netfilter_bridge.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv4/ipvs/ip_vs_ctl.c linux-2.6.16-rc2-mpf/net/ipv4/ipvs/ip_vs_ctl.c
--- linux-2.6.16-rc2/net/ipv4/ipvs/ip_vs_ctl.c	2006-02-07 11:53:22 +0100
+++ linux-2.6.16-rc2-mpf/net/ipv4/ipvs/ip_vs_ctl.c	2006-02-13 02:09:29 +0100
@@ -26,7 +26,6 @@
 #include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/sysctl.h>
-#include <linux/proc_fs.h>
 #include <linux/workqueue.h>
 #include <linux/swap.h>
 #include <linux/proc_fs.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv4/netfilter/ipt_CLUSTERIP.c linux-2.6.16-rc2-mpf/net/ipv4/netfilter/ipt_CLUSTERIP.c
--- linux-2.6.16-rc2/net/ipv4/netfilter/ipt_CLUSTERIP.c	2006-02-07 11:53:23 +0100
+++ linux-2.6.16-rc2-mpf/net/ipv4/netfilter/ipt_CLUSTERIP.c	2006-02-13 02:09:13 +0100
@@ -20,7 +20,6 @@
 #include <linux/udp.h>
 #include <linux/icmp.h>
 #include <linux/if_arp.h>
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
 #include <net/checksum.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv6/tcp_ipv6.c linux-2.6.16-rc2-mpf/net/ipv6/tcp_ipv6.c
--- linux-2.6.16-rc2/net/ipv6/tcp_ipv6.c	2006-02-07 11:53:24 +0100
+++ linux-2.6.16-rc2-mpf/net/ipv6/tcp_ipv6.c	2006-02-13 02:15:34 +0100
@@ -57,7 +57,6 @@
 #include <net/inet_ecn.h>
 #include <net/protocol.h>
 #include <net/xfrm.h>
-#include <net/addrconf.h>
 #include <net/snmp.h>
 #include <net/dsfield.h>
 #include <net/timewait_sock.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/netfilter/nf_conntrack_proto_tcp.c linux-2.6.16-rc2-mpf/net/netfilter/nf_conntrack_proto_tcp.c
--- linux-2.6.16-rc2/net/netfilter/nf_conntrack_proto_tcp.c	2006-02-07 11:53:24 +0100
+++ linux-2.6.16-rc2-mpf/net/netfilter/nf_conntrack_proto_tcp.c	2006-02-13 02:16:28 +0100
@@ -28,7 +28,6 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
-#include <linux/netfilter.h>
 #include <linux/module.h>
 #include <linux/in.h>
 #include <linux/tcp.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/netfilter/nf_conntrack_proto_udp.c linux-2.6.16-rc2-mpf/net/netfilter/nf_conntrack_proto_udp.c
--- linux-2.6.16-rc2/net/netfilter/nf_conntrack_proto_udp.c	2006-02-07 11:53:24 +0100
+++ linux-2.6.16-rc2-mpf/net/netfilter/nf_conntrack_proto_udp.c	2006-02-13 02:16:42 +0100
@@ -15,7 +15,6 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/module.h>
-#include <linux/netfilter.h>
 #include <linux/udp.h>
 #include <linux/seq_file.h>
 #include <linux/skbuff.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/sched/act_police.c linux-2.6.16-rc2-mpf/net/sched/act_police.c
--- linux-2.6.16-rc2/net/sched/act_police.c	2006-02-07 11:53:24 +0100
+++ linux-2.6.16-rc2-mpf/net/sched/act_police.c	2006-02-13 02:15:51 +0100
@@ -27,7 +27,6 @@
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
-#include <linux/module.h>
 #include <linux/rtnetlink.h>
 #include <linux/init.h>
 #include <net/sock.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/sunrpc/auth_gss/svcauth_gss.c linux-2.6.16-rc2-mpf/net/sunrpc/auth_gss/svcauth_gss.c
--- linux-2.6.16-rc2/net/sunrpc/auth_gss/svcauth_gss.c	2006-02-07 11:53:27 +0100
+++ linux-2.6.16-rc2-mpf/net/sunrpc/auth_gss/svcauth_gss.c	2006-02-13 02:11:32 +0100
@@ -44,7 +44,6 @@
 #include <linux/sunrpc/auth_gss.h>
 #include <linux/sunrpc/svcauth.h>
 #include <linux/sunrpc/gss_err.h>
-#include <linux/sunrpc/svcauth.h>
 #include <linux/sunrpc/svcauth_gss.h>
 #include <linux/sunrpc/cache.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/net/wanrouter/wanmain.c linux-2.6.16-rc2-mpf/net/wanrouter/wanmain.c
--- linux-2.6.16-rc2/net/wanrouter/wanmain.c	2006-02-07 11:53:27 +0100
+++ linux-2.6.16-rc2-mpf/net/wanrouter/wanmain.c	2006-02-13 02:16:09 +0100
@@ -58,7 +58,6 @@
 
 #include <linux/vmalloc.h>	/* vmalloc, vfree */
 #include <asm/uaccess.h>        /* copy_to/from_user */
-#include <linux/init.h>         /* __initfunc et al. */
 #include <net/syncppp.h>
 
 #define KMEM_SAFETYZONE 8
diff -NurpP --minimal linux-2.6.16-rc2/sound/core/rawmidi.c linux-2.6.16-rc2-mpf/sound/core/rawmidi.c
--- linux-2.6.16-rc2/sound/core/rawmidi.c	2006-02-07 11:53:29 +0100
+++ linux-2.6.16-rc2-mpf/sound/core/rawmidi.c	2006-02-13 02:19:02 +0100
@@ -30,7 +30,6 @@
 #include <linux/wait.h>
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
-#include <linux/wait.h>
 #include <sound/rawmidi.h>
 #include <sound/info.h>
 #include <sound/control.h>
diff -NurpP --minimal linux-2.6.16-rc2/sound/oss/rme96xx.c linux-2.6.16-rc2-mpf/sound/oss/rme96xx.c
--- linux-2.6.16-rc2/sound/oss/rme96xx.c	2006-02-07 11:53:33 +0100
+++ linux-2.6.16-rc2-mpf/sound/oss/rme96xx.c	2006-02-13 02:18:41 +0100
@@ -55,7 +55,6 @@ TODO:
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/wait.h>
 





diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/kernel/signal_32.c linux-2.6.16-rc2-mpf/arch/powerpc/kernel/signal_32.c
--- linux-2.6.16-rc2/arch/powerpc/kernel/signal_32.c	2006-02-07 11:52:11 +0100
+++ linux-2.6.16-rc2-mpf/arch/powerpc/kernel/signal_32.c	2006-02-13 01:31:25 +0100
@@ -26,13 +26,12 @@
 #include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/elf.h>
+#include <linux/ptrace.h>
 #ifdef CONFIG_PPC64
 #include <linux/syscalls.h>
 #include <linux/compat.h>
-#include <linux/ptrace.h>
 #else
 #include <linux/wait.h>
-#include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
 #include <linux/tty.h>
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv4/tcp_cubic.c linux-2.6.16-rc2-mpf/net/ipv4/tcp_cubic.c
--- linux-2.6.16-rc2/net/ipv4/tcp_cubic.c	2006-02-07 11:53:23 +0100
+++ linux-2.6.16-rc2-mpf/net/ipv4/tcp_cubic.c	2006-02-13 02:10:10 +0100
@@ -52,8 +52,6 @@ MODULE_PARM_DESC(bic_scale, "scale (scal
 module_param(tcp_friendliness, int, 0644);
 MODULE_PARM_DESC(tcp_friendliness, "turn on/off tcp friendliness");
 
-#include <asm/div64.h>
-
 /* BIC TCP Parameters */
 struct bictcp {
 	u32	cnt;		/* increase cwnd by 1 after ACKs */
diff -NurpP --minimal linux-2.6.16-rc2/mm/swapfile.c linux-2.6.16-rc2-mpf/mm/swapfile.c
--- linux-2.6.16-rc2/mm/swapfile.c	2006-02-07 11:53:18 +0100
+++ linux-2.6.16-rc2-mpf/mm/swapfile.c	2006-02-13 02:21:21 +0100
@@ -1070,7 +1070,6 @@ out:
 }
 
 #if 0	/* We don't need this yet */
-#include <linux/backing-dev.h>
 int page_queue_congested(struct page *page)
 {
 	struct backing_dev_info *bdi;
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/udp.h linux-2.6.16-rc2-mpf/include/linux/udp.h
--- linux-2.6.16-rc2/include/linux/udp.h	2006-02-07 11:53:15 +0100
+++ linux-2.6.16-rc2-mpf/include/linux/udp.h	2006-02-13 01:05:13 +0100
@@ -36,7 +36,6 @@ struct udphdr {
 
 #ifdef __KERNEL__
 #include <linux/config.h>
-#include <linux/types.h>
 
 #include <net/inet_sock.h>
 
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-ia64/unistd.h linux-2.6.16-rc2-mpf/include/asm-ia64/unistd.h
--- linux-2.6.16-rc2/include/asm-ia64/unistd.h	2006-02-07 11:53:08 +0100
+++ linux-2.6.16-rc2-mpf/include/asm-ia64/unistd.h	2006-02-13 01:03:49 +0100
@@ -301,7 +301,6 @@ extern long __ia64_syscall (long a0, lon
 
 #ifdef __KERNEL_SYSCALLS__
 
-#include <linux/compiler.h>
 #include <linux/string.h>
 #include <linux/signal.h>
 #include <asm/ptrace.h>
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-ppc/page.h linux-2.6.16-rc2-mpf/include/asm-ppc/page.h
--- linux-2.6.16-rc2/include/asm-ppc/page.h	2006-01-03 17:30:07 +0100
+++ linux-2.6.16-rc2-mpf/include/asm-ppc/page.h	2006-02-13 01:03:09 +0100
@@ -15,7 +15,6 @@
 #define PAGE_MASK	(~((1 << PAGE_SHIFT) - 1))
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 
 /* This must match what is in arch/ppc/Makefile */
 #define PAGE_OFFSET	CONFIG_KERNEL_START
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-sparc/system.h linux-2.6.16-rc2-mpf/include/asm-sparc/system.h
--- linux-2.6.16-rc2/include/asm-sparc/system.h	2006-02-07 11:53:10 +0100
+++ linux-2.6.16-rc2-mpf/include/asm-sparc/system.h	2006-02-13 01:08:00 +0100
@@ -1,6 +1,4 @@
 /* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */
-#include <linux/config.h>
-
 #ifndef __SPARC_SYSTEM_H
 #define __SPARC_SYSTEM_H
 
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/aio.h linux-2.6.16-rc2-mpf/include/linux/aio.h
--- linux-2.6.16-rc2/include/linux/aio.h	2006-02-07 11:53:13 +0100
+++ linux-2.6.16-rc2-mpf/include/linux/aio.h	2006-02-13 01:04:42 +0100
@@ -236,8 +236,6 @@ do {									\
 #define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
 #define is_retried_kiocb(iocb) ((iocb)->ki_retried > 1)
 
-#include <linux/aio_abi.h>
-
 static inline struct kiocb *list_kiocb(struct list_head *h)
 {
 	return list_entry(h, struct kiocb, ki_list);
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/atalk.h linux-2.6.16-rc2-mpf/include/linux/atalk.h
--- linux-2.6.16-rc2/include/linux/atalk.h	2006-02-07 11:53:13 +0100
+++ linux-2.6.16-rc2-mpf/include/linux/atalk.h	2006-02-13 01:05:54 +0100
@@ -85,8 +85,6 @@ static inline struct atalk_sock *at_sk(s
 	return (struct atalk_sock *)sk;
 }
 
-#include <asm/byteorder.h>
-
 struct ddpehdr {
 #ifdef __LITTLE_ENDIAN_BITFIELD
 	__u16	deh_len:10,
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-arm26/signal.h linux-2.6.16-rc2-mpf/include/asm-arm26/signal.h
--- linux-2.6.16-rc2/include/asm-arm26/signal.h	2005-06-22 02:38:42 +0200
+++ linux-2.6.16-rc2-mpf/include/asm-arm26/signal.h	2006-02-13 01:09:26 +0100
@@ -166,11 +166,6 @@ typedef struct sigaltstack {
 #include <asm/sigcontext.h>
 
 #define sigmask(sig)	(1UL << ((sig) - 1))
-#endif
-
-
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif
 
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/cs89x0.c linux-2.6.16-rc2-mpf/drivers/net/cs89x0.c
--- linux-2.6.16-rc2/drivers/net/cs89x0.c	2006-02-07 11:52:37 +0100
+++ linux-2.6.16-rc2-mpf/drivers/net/cs89x0.c	2006-02-13 01:45:14 +0100
@@ -183,13 +183,10 @@ static unsigned int cs8900_irq_map[] = {
 #elif defined(CONFIG_MACH_IXDP2351)
 static unsigned int netcard_portlist[] __initdata = {IXDP2351_VIRT_CS8900_BASE, 0};
 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
-#include <asm/irq.h>
 #elif defined(CONFIG_ARCH_IXDP2X01)
-#include <asm/irq.h>
 static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0};
 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
 #elif defined(CONFIG_ARCH_PNX010X)
-#include <asm/irq.h>
 #include <asm/arch/gpio.h>
 #define CIRRUS_DEFAULT_BASE	IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000)	/* = Physical address 0x48200000 */
 #define CIRRUS_DEFAULT_IRQ	VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h
--- linux-2.6.16-rc2/drivers/char/drm/drm.h	2006-02-07 11:52:24 +0100
+++ linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h	2006-02-13 01:48:55 +0100
@@ -51,11 +51,9 @@
 #if defined(__FreeBSD__) && defined(IN_MODULE)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
-#include <sys/ioccom.h>
 #define ioctl(a,b,c)		xf86ioctl(a,b,c)
-#else
-#include <sys/ioccom.h>
 #endif				/* __FreeBSD__ && xf86ioctl */
+#include <sys/ioccom.h>
 #define DRM_IOCTL_NR(n)		((n) & 0xff)
 #define DRM_IOC_VOID		IOC_VOID
 #define DRM_IOC_READ		IOC_OUT
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm_memory.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm_memory.h
--- linux-2.6.16-rc2/drivers/char/drm/drm_memory.h	2006-01-03 17:29:21 +0100
+++ linux-2.6.16-rc2-mpf/drivers/char/drm/drm_memory.h	2006-02-13 01:47:03 +0100
@@ -45,8 +45,6 @@
 
 #if __OS_HAS_AGP
 
-#include <linux/vmalloc.h>
-
 #ifdef HAVE_PAGE_AGP
 #include <asm/agp.h>
 #else
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh64/kernel/process.c linux-2.6.16-rc2-mpf/arch/sh64/kernel/process.c
--- linux-2.6.16-rc2/arch/sh64/kernel/process.c	2006-02-07 11:52:14 +0100
+++ linux-2.6.16-rc2-mpf/arch/sh64/kernel/process.c	2006-02-13 01:26:18 +0100
@@ -897,7 +897,6 @@ unsigned long get_wchan(struct task_stru
    */
 
 #if defined(CONFIG_SH64_PROC_ASIDS)
-#include <linux/init.h>
 #include <linux/proc_fs.h>
 
 static int

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-07-02 21:41 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-02 21:40 [PATCH] remove duplicate includes Matteo Croce
  -- strict thread matches above, loose matches on Subject: below --
2006-02-13  9:39 [PATCH] remove duplicate #includes Herbert Poetzl
2006-02-13 10:26 ` Bastian Blank
2006-02-13 15:01   ` Herbert Poetzl
2006-02-14 15:50 ` Arthur Othieno
2006-02-15  9:48   ` Herbert Poetzl
2006-02-14 21:03 ` Jean Delvare
2006-02-14 21:21   ` Andrew Morton
2006-02-15  9:52     ` Herbert Poetzl
2006-02-15 10:12 ` Russell King

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).