diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-26 05:27:47 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-26 05:27:47 -0500 |
| commit | 11be6a269d2ad3e94c0597f21786092b8340a822 (patch) | |
| tree | a1b244c74f210750d0bb7a6af03332d7ccbfacbd /sound/soc/codecs/cx20442.c | |
| parent | 4dfb8a45d533808e78d67ef27e0a47d456c12a92 (diff) | |
| parent | 43c63188821dc21b2af23a40a18faea6e386e90a (diff) | |
Merge branch 'fix/asoc' into for-linus
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 bb4bf65b9e7e..0bb424af956f 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c | |||
| @@ -367,7 +367,7 @@ static int cx20442_codec_remove(struct snd_soc_codec *codec) | |||
| 367 | return 0; | 367 | return 0; |
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | static const u8 cx20442_reg = CX20442_TELOUT | CX20442_MIC; | 370 | static const u8 cx20442_reg; |
| 371 | 371 | ||
| 372 | static struct snd_soc_codec_driver cx20442_codec_dev = { | 372 | static struct snd_soc_codec_driver cx20442_codec_dev = { |
| 373 | .probe = cx20442_codec_probe, | 373 | .probe = cx20442_codec_probe, |