diff --git a/[refs] b/[refs] index 4ef773478f9d..f87661cce3ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e098aded79f24e2024139e82f778ff9db6dc142a +refs/heads/master: 5b9cecd68f3ef72ab9e586b0c2995a40a2f1e630 diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c index 12abd5b924b3..a35fa7dcbf53 100644 --- a/trunk/drivers/mfd/twl-core.c +++ b/trunk/drivers/mfd/twl-core.c @@ -1003,7 +1003,7 @@ static int twl_remove(struct i2c_client *client) } /* NOTE: this driver only handles a single twl4030/tps659x0 chip */ -static int __init +static int __devinit twl_probe(struct i2c_client *client, const struct i2c_device_id *id) { int status;