diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-15 04:30:21 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-15 04:30:21 -0400 |
| commit | 5f592bb99b2634b2c515bb75d92cae14b1e22c51 (patch) | |
| tree | cb09f52b2906c50114848bee247e6e7285230045 /include | |
| parent | dd4a416442a2fb4bd761163277d37ab6ce75ee4e (diff) | |
| parent | 81a4275bff16b0a63074669541be6eb4d5279f26 (diff) | |
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dai.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 496dc30457b7..352d7eee9b6d 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
| @@ -79,7 +79,8 @@ struct snd_pcm_substream; | |||
| 79 | #define SND_SOC_CLOCK_OUT 1 | 79 | #define SND_SOC_CLOCK_OUT 1 |
| 80 | 80 | ||
| 81 | #define SND_SOC_STD_AC97_FMTS (SNDRV_PCM_FMTBIT_S16_LE |\ | 81 | #define SND_SOC_STD_AC97_FMTS (SNDRV_PCM_FMTBIT_S16_LE |\ |
| 82 | SNDRV_PCM_FMTBIT_S32_LE) | 82 | SNDRV_PCM_FMTBIT_S32_LE |\ |
| 83 | SNDRV_PCM_FMTBIT_S32_BE) | ||
| 83 | 84 | ||
| 84 | struct snd_soc_dai_ops; | 85 | struct snd_soc_dai_ops; |
| 85 | struct snd_soc_dai; | 86 | struct snd_soc_dai; |