git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
drivers
/
mfd
/
twl-core.c
diff --git
a/drivers/mfd/twl-core.c
b/drivers/mfd/twl-core.c
index
12abd5b
..
a35fa7d
100644
(file)
--- a/
drivers/mfd/twl-core.c
+++ b/
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 __
dev
init
twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
{
int status;