From ad52cdb35bbe5984227e0be6569e9c062daeaa16 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 27 Jul 2007 14:24:33 +0100
Subject: [PATCH] --- yaml --- r: 63110 b: refs/heads/master c:
 0af3678f7c5872836d1cc8d7c659abd62c3c5ae7 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/interrupt.h | 4 ++--
 trunk/kernel/irq/devres.c       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c060f5f66e2e..a10ec8744e15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d954d06acbcf9a5f7668a1897850c9b7be6b8f3
+refs/heads/master: 0af3678f7c5872836d1cc8d7c659abd62c3c5ae7
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index 0a3c2ebf2008..5523f19d88d2 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -11,8 +11,6 @@
 #include <linux/hardirq.h>
 #include <linux/sched.h>
 #include <linux/irqflags.h>
-#include <linux/bottom_half.h>
-#include <linux/device.h>
 #include <asm/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
@@ -97,6 +95,8 @@ extern int __must_check request_irq(unsigned int, irq_handler_t handler,
 		       unsigned long, const char *, void *);
 extern void free_irq(unsigned int, void *);
 
+struct device;
+
 extern int __must_check devm_request_irq(struct device *dev, unsigned int irq,
 			    irq_handler_t handler, unsigned long irqflags,
 			    const char *devname, void *dev_id);
diff --git a/trunk/kernel/irq/devres.c b/trunk/kernel/irq/devres.c
index d8ee241115f5..6d9204f3a370 100644
--- a/trunk/kernel/irq/devres.c
+++ b/trunk/kernel/irq/devres.c
@@ -1,5 +1,6 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/device.h>
 
 /*
  * Device resource management aware IRQ request/free implementation.