From ecf7718ece657a0e08e7d6789d31b8fe0df2375c Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 31 Mar 2009 12:27:21 +0200
Subject: [PATCH] --- yaml --- r: 142015 b: refs/heads/master c:
 fa15ce8ad59e9653d50b8596596cb02d3566d4aa h: refs/heads/master i:   142013:
 6fd9313120a197f5091bc342e26caaa98f08fc8d   142011:
 234c79d3ac17bd3b970836fae2fec668f5b029e4   142007:
 7c8ca3c2bc4334e0df906e28072fea2ceb56785c   141999:
 ab9d62c8c30ac39c72369e31c1ccdfe8fc550579   141983:
 c631e1b34e99b1dc13adb45758420e887ca4efbb   141951:
 08037d3345edbfadcceee4d75a88d9efb4d5c81c v: v3

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

diff --git a/[refs] b/[refs]
index cf1d8149f3b1..97983a37574a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 895d9f0f15ff6b2d20bfbdc2b8205d1791437294
+refs/heads/master: fa15ce8ad59e9653d50b8596596cb02d3566d4aa
diff --git a/trunk/drivers/mfd/da903x.c b/trunk/drivers/mfd/da903x.c
index 99f8dcfe3d98..7283d88656af 100644
--- a/trunk/drivers/mfd/da903x.c
+++ b/trunk/drivers/mfd/da903x.c
@@ -413,7 +413,7 @@ static void da903x_irq_work(struct work_struct *work)
 	enable_irq(chip->client->irq);
 }
 
-static int da903x_irq_handler(int irq, void *data)
+static irqreturn_t da903x_irq_handler(int irq, void *data)
 {
 	struct da903x_chip *chip = data;