diff options
Diffstat (limited to 'sound/soc/fsl/mpc8610_hpcd.c')
-rw-r--r-- | sound/soc/fsl/mpc8610_hpcd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 94f89debde1f..bcec3f60bad9 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c | |||
@@ -29,7 +29,7 @@ | |||
29 | struct mpc8610_hpcd_data { | 29 | struct mpc8610_hpcd_data { |
30 | struct snd_soc_device sound_devdata; | 30 | struct snd_soc_device sound_devdata; |
31 | struct snd_soc_dai_link dai; | 31 | struct snd_soc_dai_link dai; |
32 | struct snd_soc_machine machine; | 32 | struct snd_soc_card machine; |
33 | unsigned int dai_format; | 33 | unsigned int dai_format; |
34 | unsigned int codec_clk_direction; | 34 | unsigned int codec_clk_direction; |
35 | unsigned int cpu_clk_direction; | 35 | unsigned int cpu_clk_direction; |
@@ -185,7 +185,7 @@ static struct snd_soc_ops mpc8610_hpcd_ops = { | |||
185 | /** | 185 | /** |
186 | * mpc8610_hpcd_machine: ASoC machine data | 186 | * mpc8610_hpcd_machine: ASoC machine data |
187 | */ | 187 | */ |
188 | static struct snd_soc_machine mpc8610_hpcd_machine = { | 188 | static struct snd_soc_card mpc8610_hpcd_machine = { |
189 | .probe = mpc8610_hpcd_machine_probe, | 189 | .probe = mpc8610_hpcd_machine_probe, |
190 | .remove = mpc8610_hpcd_machine_remove, | 190 | .remove = mpc8610_hpcd_machine_remove, |
191 | .name = "MPC8610 HPCD", | 191 | .name = "MPC8610 HPCD", |
@@ -465,9 +465,9 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev, | |||
465 | goto error; | 465 | goto error; |
466 | } | 466 | } |
467 | 467 | ||
468 | machine_data->sound_devdata.machine = &mpc8610_hpcd_machine; | 468 | machine_data->sound_devdata.card = &mpc8610_hpcd_machine; |
469 | machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270; | 469 | machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270; |
470 | machine_data->sound_devdata.platform = &fsl_soc_platform; | 470 | machine_data->machine.platform = &fsl_soc_platform; |
471 | 471 | ||
472 | sound_device->dev.platform_data = machine_data; | 472 | sound_device->dev.platform_data = machine_data; |
473 | 473 | ||