Merge branch 'for-2.6.38' into for-2.6.39

4a5aa6e9 · Mark Brown · b4d06f45 · 8e6bfb9b · 4a5aa6e9
Commit 4a5aa6e9 authored Feb 11, 2011 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/codecs/cx20442.c sound/soc/codecs/cx20442.c +1 -1

No files found.
--- 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)
 	return 0;
 }
-static const u8 cx20442_reg = CX20442_TELOUT | CX20442_MIC;
+static const u8 cx20442_reg;
 static struct snd_soc_codec_driver cx20442_codec_dev = {
 	.probe = 	cx20442_codec_probe,