diff options
Diffstat (limited to 'sound/soc/pxa/poodle.c')
| -rw-r--r-- | sound/soc/pxa/poodle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 4d9930c52789..6e9827189fff 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
| @@ -276,8 +276,9 @@ static struct snd_soc_dai_link poodle_dai = { | |||
| 276 | }; | 276 | }; |
| 277 | 277 | ||
| 278 | /* poodle audio machine driver */ | 278 | /* poodle audio machine driver */ |
| 279 | static struct snd_soc_machine snd_soc_machine_poodle = { | 279 | static struct snd_soc_card snd_soc_poodle = { |
| 280 | .name = "Poodle", | 280 | .name = "Poodle", |
| 281 | .platform = &pxa2xx_soc_platform, | ||
| 281 | .dai_link = &poodle_dai, | 282 | .dai_link = &poodle_dai, |
| 282 | .num_links = 1, | 283 | .num_links = 1, |
| 283 | }; | 284 | }; |
| @@ -290,8 +291,7 @@ static struct wm8731_setup_data poodle_wm8731_setup = { | |||
| 290 | 291 | ||
| 291 | /* poodle audio subsystem */ | 292 | /* poodle audio subsystem */ |
| 292 | static struct snd_soc_device poodle_snd_devdata = { | 293 | static struct snd_soc_device poodle_snd_devdata = { |
| 293 | .machine = &snd_soc_machine_poodle, | 294 | .card = &snd_soc_poodle, |
| 294 | .platform = &pxa2xx_soc_platform, | ||
| 295 | .codec_dev = &soc_codec_dev_wm8731, | 295 | .codec_dev = &soc_codec_dev_wm8731, |
| 296 | .codec_data = &poodle_wm8731_setup, | 296 | .codec_data = &poodle_wm8731_setup, |
| 297 | }; | 297 | }; |
