diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
| commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
| tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /sound/soc/codecs/cx20442.c | |
| parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) | |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'sound/soc/codecs/cx20442.c')
| -rw-r--r-- | sound/soc/codecs/cx20442.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index 9f169c477108..f07a415c753f 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c | |||
| @@ -387,7 +387,7 @@ static int cx20442_register(struct cx20442_priv *cx20442) | |||
| 387 | 387 | ||
| 388 | codec->name = "CX20442"; | 388 | codec->name = "CX20442"; |
| 389 | codec->owner = THIS_MODULE; | 389 | codec->owner = THIS_MODULE; |
| 390 | codec->private_data = cx20442; | 390 | snd_soc_codec_set_drvdata(codec, cx20442); |
| 391 | 391 | ||
| 392 | codec->dai = &cx20442_dai; | 392 | codec->dai = &cx20442_dai; |
| 393 | codec->num_dai = 1; | 393 | codec->num_dai = 1; |