diff -urN RC14-rc2-git8-9fs/arch/um/drivers/port_kern.c RC14-rc2-git8-uml-irq/arch/um/drivers/port_kern.c
--- RC14-rc2-git8-9fs/arch/um/drivers/port_kern.c	2005-08-28 23:09:40.000000000 -0400
+++ RC14-rc2-git8-uml-irq/arch/um/drivers/port_kern.c	2005-09-30 07:34:39.000000000 -0400
@@ -7,7 +7,6 @@
 #include "linux/sched.h"
 #include "linux/slab.h"
 #include "linux/interrupt.h"
-#include "linux/irq.h"
 #include "linux/spinlock.h"
 #include "linux/errno.h"
 #include "asm/atomic.h"
diff -urN RC14-rc2-git8-9fs/arch/um/kernel/irq.c RC14-rc2-git8-uml-irq/arch/um/kernel/irq.c
--- RC14-rc2-git8-9fs/arch/um/kernel/irq.c	2005-09-05 07:05:14.000000000 -0400
+++ RC14-rc2-git8-uml-irq/arch/um/kernel/irq.c	2005-09-30 07:34:39.000000000 -0400
@@ -9,7 +9,6 @@
 #include "linux/kernel.h"
 #include "linux/module.h"
 #include "linux/smp.h"
-#include "linux/irq.h"
 #include "linux/kernel_stat.h"
 #include "linux/interrupt.h"
 #include "linux/random.h"