Commit 2449ae85 authored by Mark Brown's avatar Mark Brown

Merge branch 'twl4030-mfd' into for-2.6.33

parents 97cef585 b5e102cd
...@@ -777,7 +777,7 @@ static int twl4030_remove(struct i2c_client *client) ...@@ -777,7 +777,7 @@ static int twl4030_remove(struct i2c_client *client)
} }
/* NOTE: this driver only handles a single twl4030/tps659x0 chip */ /* 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) twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id)
{ {
int status; int status;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment