summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-11-25 14:25:36 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-11-25 14:25:36 +0000
commit2449ae85e3c88ef27853aef0d19772149e269ae7 (patch)
tree2fc2dbf75948b742a94df253b49a179d83536b15 /drivers/mfd
parent97cef58521288ade8d957e4d568a3d409dea7d64 (diff)
parentb5e102cdcfb4a5d4349a9628eb5ad11bd65a1f3b (diff)
Merge branch 'twl4030-mfd' into for-2.6.33
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/twl4030-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index cc3f77bd760..98b984e191d 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -777,7 +777,7 @@ static int twl4030_remove(struct i2c_client *client)
}
/* NOTE: this driver only handles a single twl4030/tps659x0 chip */
-static int
+static int __init
twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
{
int status;