Merge branch 'twl4030-mfd' into for-2.6.33

2449ae85 · Mark Brown · 97cef585 · b5e102cd · 2449ae85
Commit 2449ae85 authored Nov 25, 2009 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/mfd/twl4030-core.c drivers/mfd/twl4030-core.c +1 -1

No files found.
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -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;