projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc...
[linux-2.6-block.git]
/
sound
/
soc
/
codecs
/
max98090.c
diff --git
a/sound/soc/codecs/max98090.c
b/sound/soc/codecs/max98090.c
index 96a47459b3d7cb881e90b5fd83372daff07507a3..98c6e104357cbe59416f8d602a24ec63e1b68696 100644
(file)
--- a/
sound/soc/codecs/max98090.c
+++ b/
sound/soc/codecs/max98090.c
@@
-2343,7
+2343,6
@@
static int max98090_i2c_probe(struct i2c_client *i2c,
max98090->devtype = id->driver_data;
i2c_set_clientdata(i2c, max98090);
- max98090->control_data = i2c;
max98090->pdata = i2c->dev.platform_data;
max98090->irq = i2c->irq;