From 771ff5bcd895851c7c7708f2b7d30b7d3a7115e4 Mon Sep 17 00:00:00 2001
From: MyungJoo Ham <myungjoo.ham@samsung.com>
Date: Thu, 18 Aug 2011 16:37:35 +0900
Subject: [PATCH] --- yaml --- r: 263957 b: refs/heads/master c:
 7eb3154e6caf7945ce60c196637b7ac06213befd h: refs/heads/master i:   263955:
 573001803e8db4356f1002919ffc2882c1be05b3 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mfd/max8997.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5cc42ffcf211..9ba44a14ecca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa948761e685fb03823b3029e5b6bdb52229d6ce
+refs/heads/master: 7eb3154e6caf7945ce60c196637b7ac06213befd
diff --git a/trunk/drivers/mfd/max8997.c b/trunk/drivers/mfd/max8997.c
index 5d1fca0277ef..f83103b8970d 100644
--- a/trunk/drivers/mfd/max8997.c
+++ b/trunk/drivers/mfd/max8997.c
@@ -135,10 +135,13 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
 	max8997->dev = &i2c->dev;
 	max8997->i2c = i2c;
 	max8997->type = id->driver_data;
+	max8997->irq = i2c->irq;
 
 	if (!pdata)
 		goto err;
 
+	max8997->irq_base = pdata->irq_base;
+	max8997->ono = pdata->ono;
 	max8997->wakeup = pdata->wakeup;
 
 	mutex_init(&max8997->iolock);
@@ -152,6 +155,8 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
 
 	pm_runtime_set_active(max8997->dev);
 
+	max8997_irq_init(max8997);
+
 	mfd_add_devices(max8997->dev, -1, max8997_devs,
 			ARRAY_SIZE(max8997_devs),
 			NULL, 0);