summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-18 15:22:18 +0200
committerTakashi Iwai <tiwai@suse.de>2010-08-18 15:22:18 +0200
commit2ea1ef5789c52dfdff6da81bc0d2eb8b62f73c23 (patch)
tree9f3b8e39a19c9a1666caf8756513aef2438b054e
parent76165a3063356ec898159d942ef4d2c69cc26801 (diff)
parentb2c1e07b81a126e5846dfc3d36f559d861df59f4 (diff)
downloadlinux-3.10-2ea1ef5789c52dfdff6da81bc0d2eb8b62f73c23.tar.gz
linux-3.10-2ea1ef5789c52dfdff6da81bc0d2eb8b62f73c23.tar.bz2
linux-3.10-2ea1ef5789c52dfdff6da81bc0d2eb8b62f73c23.zip
Merge branch 'fix/asoc' into for-linus
-rw-r--r--sound/soc/codecs/wm8776.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c
index 4e212ed62ea..f8154e66152 100644
--- a/sound/soc/codecs/wm8776.c
+++ b/sound/soc/codecs/wm8776.c
@@ -178,13 +178,6 @@ static int wm8776_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
case SND_SOC_DAIFMT_LEFT_J:
iface |= 0x0001;
break;
- /* FIXME: CHECK A/B */
- case SND_SOC_DAIFMT_DSP_A:
- iface |= 0x0003;
- break;
- case SND_SOC_DAIFMT_DSP_B:
- iface |= 0x0007;
- break;
default:
return -EINVAL;
}