Merge branch 'twl4030-mfd' into for-2.6.33

This commit is contained in:
Mark Brown 2009-11-25 14:25:36 +00:00
commit 2449ae85e3

View File

@ -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;