From 4970a99231f35f1648bced0ed5df6a86ac9dd22d Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 20 Dec 2011 18:35:55 +0100
Subject: [PATCH] --- yaml --- r: 284586 b: refs/heads/master c:
 8ad1a973f9a9aad8e170419581a8e98a0f8d1e19 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f0c2a60b2483..796ecabdea32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dba61c8f4fd14c4cbf375f6cdc814da87722d825
+refs/heads/master: 8ad1a973f9a9aad8e170419581a8e98a0f8d1e19
diff --git a/trunk/drivers/mfd/stmpe.c b/trunk/drivers/mfd/stmpe.c
index f99bc2be34ee..e07947e56b2a 100644
--- a/trunk/drivers/mfd/stmpe.c
+++ b/trunk/drivers/mfd/stmpe.c
@@ -958,7 +958,7 @@ static int __devinit stmpe_devices_init(struct stmpe *stmpe)
 }
 
 /* Called from client specific probe routines */
-int stmpe_probe(struct stmpe_client_info *ci, int partnum)
+int __devinit stmpe_probe(struct stmpe_client_info *ci, int partnum)
 {
 	struct stmpe_platform_data *pdata = dev_get_platdata(ci->dev);
 	struct stmpe *stmpe;