From 65fce14cde699038d67de371e36d6ce2a628079b Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Fri, 1 Oct 2010 16:35:59 +0200
Subject: [PATCH] --- yaml --- r: 212135 b: refs/heads/master c:
 35a27e8e6565910e5202f1af83ea85305fbf5ceb h: refs/heads/master i:   212133:
 a64da8b58d4d2c11fd8677dd045136494bbb8096   212131:
 b17179a22265cfe75faabe11f083606fbab779b3   212127:
 97853a83732285def4f4dc1d707a8ff5ae928c10 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mfd/twl4030-irq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 215c82e638d9..53296c5a790e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1ea13c6e2cce0106531852daaa93dd97aec9580
+refs/heads/master: 35a27e8e6565910e5202f1af83ea85305fbf5ceb
diff --git a/trunk/drivers/mfd/twl4030-irq.c b/trunk/drivers/mfd/twl4030-irq.c
index 097f24d8bceb..61c86642407c 100644
--- a/trunk/drivers/mfd/twl4030-irq.c
+++ b/trunk/drivers/mfd/twl4030-irq.c
@@ -78,7 +78,7 @@ struct sih {
 	u8	irq_lines;		/* number of supported irq lines */
 
 	/* SIR ignored -- set interrupt, for testing only */
-	struct irq_data {
+	struct sih_irq_data {
 		u8	isr_offset;
 		u8	imr_offset;
 	} mask[2];