Skip to content

Commit

Permalink
Merge branch 'twl4030-mfd' into for-2.6.33
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Nov 25, 2009
2 parents 97cef58 + b5e102c commit 2449ae8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/mfd/twl4030-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2449ae8

Please sign in to comment.