diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-25 09:25:36 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-25 09:25:36 -0500 |
| commit | 2449ae85e3c88ef27853aef0d19772149e269ae7 (patch) | |
| tree | 2fc2dbf75948b742a94df253b49a179d83536b15 /drivers/mfd | |
| parent | 97cef58521288ade8d957e4d568a3d409dea7d64 (diff) | |
| parent | b5e102cdcfb4a5d4349a9628eb5ad11bd65a1f3b (diff) | |
Merge branch 'twl4030-mfd' into for-2.6.33
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index cc3f77bd7608..98b984e191d5 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) | |||
| 777 | } | 777 | } |
| 778 | 778 | ||
| 779 | /* NOTE: this driver only handles a single twl4030/tps659x0 chip */ | 779 | /* NOTE: this driver only handles a single twl4030/tps659x0 chip */ |
| 780 | static int | 780 | static int __init |
| 781 | twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id) | 781 | twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id) |
| 782 | { | 782 | { |
| 783 | int status; | 783 | int status; |