From 4661b396524078461edecbb155322d744ee91987 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 30 Sep 2005 03:16:43 +0100
Subject: [PATCH] --- yaml --- r: 9471 b: refs/heads/master c:
 74ba1fd96666170338dc732480b35b7a83cd164b h: refs/heads/master i:   9469:
 c42e38240800150195023b4bf12bc92c9b19312e   9467:
 e8c5f49f3d66fbc62289c23200ef94ec3e61d102   9463:
 86b23271eec0d16492c088f8a36e9e8b62e10b7c   9455:
 6f06751edf4dfccbc91464d98a419c42aa43f4b7   9439:
 181fe58c712af60513ff79a6866714f697461444   9407:
 351d74156788e9502b22cb939968b4a4e027f6f4   9343:
 80a0db43f3cb404ea880e08f08a938b083095335   9215:
 a1ace4a95b363b50e5732ed90db4696d619744ba v: v3

---
 [refs]                            | 2 +-
 trunk/arch/um/drivers/port_kern.c | 1 -
 trunk/arch/um/kernel/irq.c        | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1a355a7cbd47..dd9e8e27208b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 192eaa28ba7b44485e521df7ba7a2ccbc4cc4d13
+refs/heads/master: 74ba1fd96666170338dc732480b35b7a83cd164b
diff --git a/trunk/arch/um/drivers/port_kern.c b/trunk/arch/um/drivers/port_kern.c
index c41efd207fcc..189839e4f1d4 100644
--- a/trunk/arch/um/drivers/port_kern.c
+++ b/trunk/arch/um/drivers/port_kern.c
@@ -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 --git a/trunk/arch/um/kernel/irq.c b/trunk/arch/um/kernel/irq.c
index dcd814971995..bbf94bf2921e 100644
--- a/trunk/arch/um/kernel/irq.c
+++ b/trunk/arch/um/kernel/irq.c
@@ -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"