diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/4xx/bamboo.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/4xx/bamboo.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/4xx/bamboo.c	2005-09-05 07:05:13.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/4xx/bamboo.c	2005-09-30 07:34:45.000000000 -0400
@@ -27,7 +27,6 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/initrd.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/tty.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/4xx/ebony.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/4xx/ebony.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/4xx/ebony.c	2005-09-10 15:41:34.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/4xx/ebony.c	2005-09-30 07:34:45.000000000 -0400
@@ -30,7 +30,6 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/initrd.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/tty.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/4xx/luan.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/4xx/luan.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/4xx/luan.c	2005-09-05 07:05:13.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/4xx/luan.c	2005-09-30 07:34:45.000000000 -0400
@@ -28,7 +28,6 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/initrd.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/tty.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/4xx/ocotea.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/4xx/ocotea.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/4xx/ocotea.c	2005-09-05 07:05:13.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/4xx/ocotea.c	2005-09-30 07:34:45.000000000 -0400
@@ -28,7 +28,6 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/initrd.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/tty.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/83xx/mpc834x_sys.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/83xx/mpc834x_sys.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/83xx/mpc834x_sys.c	2005-09-05 07:05:13.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/83xx/mpc834x_sys.c	2005-09-30 07:34:45.000000000 -0400
@@ -24,7 +24,6 @@
 #include <linux/major.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/serial.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/mpc8540_ads.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/mpc8540_ads.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/mpc8540_ads.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/mpc8540_ads.c	2005-09-30 07:34:45.000000000 -0400
@@ -24,7 +24,6 @@
 #include <linux/major.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/serial.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/mpc8560_ads.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/mpc8560_ads.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/mpc8560_ads.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/mpc8560_ads.c	2005-09-30 07:34:45.000000000 -0400
@@ -24,7 +24,6 @@
 #include <linux/major.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/serial.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/mpc85xx_ads_common.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/mpc85xx_ads_common.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/mpc85xx_ads_common.c	2005-09-30 07:34:45.000000000 -0400
@@ -24,7 +24,6 @@
 #include <linux/major.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/serial.h>
 #include <linux/module.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/mpc85xx_cds_common.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/mpc85xx_cds_common.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/mpc85xx_cds_common.c	2005-09-30 07:34:45.000000000 -0400
@@ -24,7 +24,6 @@
 #include <linux/major.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/serial.h>
 #include <linux/module.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/sbc8560.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/sbc8560.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/sbc8560.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/sbc8560.c	2005-09-30 07:34:45.000000000 -0400
@@ -24,7 +24,6 @@
 #include <linux/major.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/serial.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/sbc85xx.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/sbc85xx.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/sbc85xx.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/sbc85xx.c	2005-09-30 07:34:45.000000000 -0400
@@ -23,7 +23,6 @@
 #include <linux/major.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/serial.h>
 #include <linux/module.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/stx_gp3.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/stx_gp3.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/85xx/stx_gp3.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/85xx/stx_gp3.c	2005-09-30 07:34:45.000000000 -0400
@@ -30,7 +30,6 @@
 #include <linux/blkdev.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/root_dev.h>
 #include <linux/seq_file.h>
 #include <linux/serial.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/chestnut.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/chestnut.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/chestnut.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/chestnut.c	2005-09-30 07:34:45.000000000 -0400
@@ -35,7 +35,6 @@
 #include <asm/time.h>
 #include <asm/dma.h>
 #include <asm/io.h>
-#include <linux/irq.h>
 #include <asm/hw_irq.h>
 #include <asm/machdep.h>
 #include <asm/kgdb.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/chrp_setup.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/chrp_setup.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/chrp_setup.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/chrp_setup.c	2005-09-30 07:34:45.000000000 -0400
@@ -32,7 +32,6 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/ide.h>
-#include <linux/irq.h>
 #include <linux/console.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/gemini_setup.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/gemini_setup.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/gemini_setup.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/gemini_setup.c	2005-09-30 07:34:45.000000000 -0400
@@ -21,7 +21,6 @@
 #include <linux/major.h>
 #include <linux/initrd.h>
 #include <linux/console.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/bcd.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/mvme5100.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/mvme5100.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/mvme5100.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/mvme5100.c	2005-09-30 07:34:45.000000000 -0400
@@ -20,7 +20,6 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/ide.h>
 #include <linux/seq_file.h>
 #include <linux/kdev_t.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/pmac_setup.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/pmac_setup.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/pmac_setup.c	2005-09-26 00:19:12.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/pmac_setup.c	2005-09-30 07:34:45.000000000 -0400
@@ -48,7 +48,6 @@
 #include <linux/adb.h>
 #include <linux/cuda.h>
 #include <linux/pmu.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/bitops.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/powerpmc250.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/powerpmc250.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/powerpmc250.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/powerpmc250.c	2005-09-30 07:34:45.000000000 -0400
@@ -26,7 +26,6 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/slab.h>
 #include <linux/seq_file.h>
 #include <linux/ide.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/pplus.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/pplus.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/pplus.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/pplus.c	2005-09-30 07:34:45.000000000 -0400
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 #include <linux/console.h>
 #include <linux/pci.h>
-#include <linux/irq.h>
 #include <linux/ide.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/prpmc750.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/prpmc750.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/prpmc750.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/prpmc750.c	2005-09-30 07:34:45.000000000 -0400
@@ -24,7 +24,6 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/ide.h>
 #include <linux/root_dev.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/prpmc800.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/prpmc800.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/prpmc800.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/prpmc800.c	2005-09-30 07:34:45.000000000 -0400
@@ -22,7 +22,6 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/ide.h>
 #include <linux/root_dev.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/radstone_ppc7d.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/radstone_ppc7d.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/radstone_ppc7d.c	2005-06-17 15:48:29.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/radstone_ppc7d.c	2005-09-30 07:34:45.000000000 -0400
@@ -32,7 +32,6 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/ide.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
@@ -59,7 +58,6 @@
 #include <asm/mpc10x.h>
 #include <asm/pci-bridge.h>
 #include <asm/mv64x60.h>
-#include <asm/i8259.h>
 
 #include "radstone_ppc7d.h"
 
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/sandpoint.c RC14-rc2-git8-ppc-irq/arch/ppc/platforms/sandpoint.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/platforms/sandpoint.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/platforms/sandpoint.c	2005-09-30 07:34:45.000000000 -0400
@@ -74,7 +74,6 @@
 #include <linux/initrd.h>
 #include <linux/console.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/ide.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/syslib/open_pic.c RC14-rc2-git8-ppc-irq/arch/ppc/syslib/open_pic.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/syslib/open_pic.c	2005-09-05 07:05:13.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/syslib/open_pic.c	2005-09-30 07:34:45.000000000 -0400
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/sysdev.h>
 #include <linux/errno.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/syslib/open_pic2.c RC14-rc2-git8-ppc-irq/arch/ppc/syslib/open_pic2.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/syslib/open_pic2.c	2005-09-22 01:17:30.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/syslib/open_pic2.c	2005-09-30 07:34:45.000000000 -0400
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/init.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/sysdev.h>
 #include <linux/errno.h>
diff -urN RC14-rc2-git8-ppc-iomem/arch/ppc/syslib/ppc4xx_setup.c RC14-rc2-git8-ppc-irq/arch/ppc/syslib/ppc4xx_setup.c
--- RC14-rc2-git8-ppc-iomem/arch/ppc/syslib/ppc4xx_setup.c	2005-09-05 07:05:13.000000000 -0400
+++ RC14-rc2-git8-ppc-irq/arch/ppc/syslib/ppc4xx_setup.c	2005-09-30 07:34:45.000000000 -0400
@@ -18,7 +18,6 @@
 #include <linux/smp.h>
 #include <linux/threads.h>
 #include <linux/spinlock.h>
-#include <linux/irq.h>
 #include <linux/reboot.h>
 #include <linux/param.h>
 #include <linux/string.h>