diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-11 06:14:20 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-11 06:14:20 -0500 |
| commit | 4a5aa6e9ea670cf8de39ae0b87010fce41a6dd73 (patch) | |
| tree | 7b35e9cb5582fabe57099a9409f1a2403bfce61e | |
| parent | b4d06f456dcf956761e2c927e62b03861f07dbbf (diff) | |
| parent | 8e6bfb9b1f79e07c18b0ae406c7c678fc54e4d8e (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
| -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, |