diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:22 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-04 10:40:25 +0100 |
commit | 888a8a3e9d79cbb9d83e53955f684998248580ec (patch) | |
tree | 3dbf548438c77d89c8696a9a79c4129cdc2f3d3e /sound/soc/codecs/cx20442.c | |
parent | cfff2d909cbdaf8c467bd321aa0502a548ec8f7e (diff) | |
parent | b06b3d49699a52e8f9ca056c4f96e81b1987d78e (diff) |
Merge branch 'perf/urgent' into perf/core
Merge reason: Pick up updates before queueing up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 bb4bf65b9e7..0bb424af956 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) 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, |