From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 25 Dec 2008 15:27:54 +0000 (+0100)
Subject: Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.28' into... 
X-Git-Tag: v2.6.29-rc1~570^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=860cf8894b326e4b89720f520540604834337b72;p=linux-2.6-omap-h63xx.git

Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.28' into irq/core
---

860cf8894b326e4b89720f520540604834337b72
diff --cc include/linux/irq.h
index 838a977885e,7fa7f30fccb,3dddfa703eb,3dddfa703eb..98564dc6447
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@@@@ -128,9 -129,14 -129,9 -129,9 +129,14 @@@@@ struct irq_chip 
    	const char	*typename;
    };
    
+ ++struct timer_rand_state;
+ ++struct irq_2_iommu;
    /**
     * struct irq_desc - interrupt descriptor
-    *
+    * @irq:		interrupt number for this descriptor
+ ++ * @timer_rand_state:	pointer to timer rand state struct
+ ++ * @kstat_irqs:		irq stats per cpu
+ ++ * @irq_2_iommu:	iommu with this irq
     * @handle_irq:		highlevel irq-events handler [if NULL, __do_IRQ()]
     * @chip:		low level interrupt hardware access
     * @msi_desc:		MSI descriptor