diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 09:22:18 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 09:22:18 -0400 |
| commit | 2ea1ef5789c52dfdff6da81bc0d2eb8b62f73c23 (patch) | |
| tree | 9f3b8e39a19c9a1666caf8756513aef2438b054e /sound | |
| parent | 76165a3063356ec898159d942ef4d2c69cc26801 (diff) | |
| parent | b2c1e07b81a126e5846dfc3d36f559d861df59f4 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8776.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 4e212ed62ea6..f8154e661524 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) | |||
| 178 | case SND_SOC_DAIFMT_LEFT_J: | 178 | case SND_SOC_DAIFMT_LEFT_J: |
| 179 | iface |= 0x0001; | 179 | iface |= 0x0001; |
| 180 | break; | 180 | break; |
| 181 | /* FIXME: CHECK A/B */ | ||
| 182 | case SND_SOC_DAIFMT_DSP_A: | ||
| 183 | iface |= 0x0003; | ||
| 184 | break; | ||
| 185 | case SND_SOC_DAIFMT_DSP_B: | ||
| 186 | iface |= 0x0007; | ||
| 187 | break; | ||
| 188 | default: | 181 | default: |
| 189 | return -EINVAL; | 182 | return -EINVAL; |
| 190 | } | 183 | } |