From ad66d72b305adf2d3db8c44f5126a7b3218c3e64 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 3 Mar 2009 16:58:16 +0100
Subject: [PATCH] --- yaml --- r: 135795 b: refs/heads/master c:
 a9d0a1a38352c4fb8946e73b3e42ba4ada29e733 h: refs/heads/master i:   135793:
 65e269e742fee8315123c38643b9320a83321637   135791:
 0c7223d95314fd16c38061df7595eec9df31dfcc v: v3

---
 [refs]                                      |  2 +-
 trunk/Documentation/DocBook/genericirq.tmpl |  1 +
 trunk/include/linux/interrupt.h             | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7a34be61e274..eb7a77b5bb79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4553573277906901f62f73c0432b332c53de5e2c
+refs/heads/master: a9d0a1a38352c4fb8946e73b3e42ba4ada29e733
diff --git a/trunk/Documentation/DocBook/genericirq.tmpl b/trunk/Documentation/DocBook/genericirq.tmpl
index 3a882d9a90a9..c671a0168096 100644
--- a/trunk/Documentation/DocBook/genericirq.tmpl
+++ b/trunk/Documentation/DocBook/genericirq.tmpl
@@ -440,6 +440,7 @@ desc->chip->end();
      used in the generic IRQ layer.
      </para>
 !Iinclude/linux/irq.h
+!Iinclude/linux/interrupt.h
   </chapter>
 
   <chapter id="pubfunctions">
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index 468e3a25a4a1..91658d076598 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -61,6 +61,17 @@
 
 typedef irqreturn_t (*irq_handler_t)(int, void *);
 
+/**
+ * struct irqaction - per interrupt action descriptor
+ * @handler:	interrupt handler function
+ * @flags:	flags (see IRQF_* above)
+ * @mask:	no comment as it is useless and about to be removed
+ * @name:	name of the device
+ * @dev_id:	cookie to identify the device
+ * @next:	pointer to the next irqaction for shared interrupts
+ * @irq:	interrupt number
+ * @dir:	pointer to the proc/irq/NN/name entry
+ */
 struct irqaction {
 	irq_handler_t handler;
 	unsigned long flags;