diff options
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/hac.c | 4 | ||||
-rw-r--r-- | sound/soc/sh/ssi.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/sh/hac.c b/sound/soc/sh/hac.c index 3318071dc80f..c435913c60eb 100644 --- a/sound/soc/sh/hac.c +++ b/sound/soc/sh/hac.c | |||
@@ -271,7 +271,7 @@ struct snd_soc_dai sh4_hac_dai[] = { | |||
271 | { | 271 | { |
272 | .name = "HAC0", | 272 | .name = "HAC0", |
273 | .id = 0, | 273 | .id = 0, |
274 | .type = SND_SOC_DAI_AC97, | 274 | .ac97_control = 1, |
275 | .playback = { | 275 | .playback = { |
276 | .rates = AC97_RATES, | 276 | .rates = AC97_RATES, |
277 | .formats = AC97_FMTS, | 277 | .formats = AC97_FMTS, |
@@ -291,8 +291,8 @@ struct snd_soc_dai sh4_hac_dai[] = { | |||
291 | #ifdef CONFIG_CPU_SUBTYPE_SH7760 | 291 | #ifdef CONFIG_CPU_SUBTYPE_SH7760 |
292 | { | 292 | { |
293 | .name = "HAC1", | 293 | .name = "HAC1", |
294 | .ac97_control = 1, | ||
294 | .id = 1, | 295 | .id = 1, |
295 | .type = SND_SOC_DAI_AC97, | ||
296 | .playback = { | 296 | .playback = { |
297 | .rates = AC97_RATES, | 297 | .rates = AC97_RATES, |
298 | .formats = AC97_FMTS, | 298 | .formats = AC97_FMTS, |
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index 52a233840d27..fed544a3deff 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c | |||
@@ -340,7 +340,6 @@ struct snd_soc_dai sh4_ssi_dai[] = { | |||
340 | { | 340 | { |
341 | .name = "SSI0", | 341 | .name = "SSI0", |
342 | .id = 0, | 342 | .id = 0, |
343 | .type = SND_SOC_DAI_I2S, | ||
344 | .playback = { | 343 | .playback = { |
345 | .rates = SSI_RATES, | 344 | .rates = SSI_RATES, |
346 | .formats = SSI_FMTS, | 345 | .formats = SSI_FMTS, |
@@ -367,7 +366,6 @@ struct snd_soc_dai sh4_ssi_dai[] = { | |||
367 | { | 366 | { |
368 | .name = "SSI1", | 367 | .name = "SSI1", |
369 | .id = 1, | 368 | .id = 1, |
370 | .type = SND_SOC_DAI_I2S, | ||
371 | .playback = { | 369 | .playback = { |
372 | .rates = SSI_RATES, | 370 | .rates = SSI_RATES, |
373 | .formats = SSI_FMTS, | 371 | .formats = SSI_FMTS, |