diff options
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc-dai.h | 2 | ||||
-rw-r--r-- | include/sound/soc.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index f51cb55902f7..a01a24b10196 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h | |||
@@ -184,7 +184,7 @@ struct snd_soc_dai { | |||
184 | /* DAI description */ | 184 | /* DAI description */ |
185 | char *name; | 185 | char *name; |
186 | unsigned int id; | 186 | unsigned int id; |
187 | unsigned char type; | 187 | int ac97_control; |
188 | 188 | ||
189 | /* DAI callbacks */ | 189 | /* DAI callbacks */ |
190 | int (*probe)(struct platform_device *pdev, | 190 | int (*probe)(struct platform_device *pdev, |
diff --git a/include/sound/soc.h b/include/sound/soc.h index e4465f73aa46..444f9c211379 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -143,14 +143,6 @@ enum snd_soc_bias_level { | |||
143 | SND_SOC_BIAS_OFF, | 143 | SND_SOC_BIAS_OFF, |
144 | }; | 144 | }; |
145 | 145 | ||
146 | /* | ||
147 | * Digital Audio Interface (DAI) types | ||
148 | */ | ||
149 | #define SND_SOC_DAI_AC97 0x1 | ||
150 | #define SND_SOC_DAI_I2S 0x2 | ||
151 | #define SND_SOC_DAI_PCM 0x4 | ||
152 | #define SND_SOC_DAI_AC97_BUS 0x8 /* for custom i.e. non ac97_codec.c */ | ||
153 | |||
154 | struct snd_soc_device; | 146 | struct snd_soc_device; |
155 | struct snd_soc_pcm_stream; | 147 | struct snd_soc_pcm_stream; |
156 | struct snd_soc_ops; | 148 | struct snd_soc_ops; |