Merge branch 'twl4030-mfd' into for-2.6.33
This commit is contained in:
commit
2449ae85e3
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue