From 5a23f8056f27d6922b7191949d2c804ab8c12ca4 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 10 Feb 2011 13:08:38 +0100
Subject: [PATCH] --- yaml --- r: 234750 b: refs/heads/master c:
 2bff17ad2107c66fc8ca96501a7128dd7fa7a390 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/irq.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 081a540cd44a..78998a7f8baf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d4d8fc9ac3e9a90bbdf90bae6864cb2c01f2208
+refs/heads/master: 2bff17ad2107c66fc8ca96501a7128dd7fa7a390
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index 2e3d1e5f0408..aefb30bbcf0e 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -253,6 +253,7 @@ static inline bool irqd_is_level_type(struct irq_data *d)
  * @irq_set_wake:	enable/disable power-management wake-on of an IRQ
  * @irq_bus_lock:	function to lock access to slow bus (i2c) chips
  * @irq_bus_sync_unlock:function to sync and unlock slow bus (i2c) chips
+ * @flags:		chip specific flags
  *
  * @release:		release function solely used by UML
  */
@@ -299,6 +300,8 @@ struct irq_chip {
 	void		(*irq_bus_lock)(struct irq_data *data);
 	void		(*irq_bus_sync_unlock)(struct irq_data *data);
 
+	unsigned long	flags;
+
 	/* Currently used only by UML, might disappear one day.*/
 #ifdef CONFIG_IRQ_RELEASE_METHOD
 	void		(*release)(unsigned int irq, void *dev_id);