diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:25 +0100 |
| commit | 5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57 (patch) | |
| tree | 6b932687edc73c07e544ccba3f0130fdb257d902 /sound/soc/pxa/em-x270.c | |
| parent | Merge branch 'topic/aoa' into to-push (diff) | |
| parent | ALSA: ASoC: fix a typo in omp-pcm.c (diff) | |
| download | linux-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.tar.xz linux-5c8261e44eaebbc91f9fc1bbd3f3167e91a50a57.zip | |
Merge branch 'topic/asoc' into to-push
Diffstat (limited to 'sound/soc/pxa/em-x270.c')
| -rw-r--r-- | sound/soc/pxa/em-x270.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index e6ff6929ab4b..fe4a729ea648 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c @@ -23,7 +23,6 @@ #include <linux/moduleparam.h> #include <linux/device.h> -#include <sound/driver.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> @@ -53,15 +52,15 @@ static struct snd_soc_dai_link em_x270_dai[] = { }, }; -static struct snd_soc_machine em_x270 = { +static struct snd_soc_card em_x270 = { .name = "EM-X270", + .platform = &pxa2xx_soc_platform, .dai_link = em_x270_dai, .num_links = ARRAY_SIZE(em_x270_dai), }; static struct snd_soc_device em_x270_snd_devdata = { - .machine = &em_x270, - .platform = &pxa2xx_soc_platform, + .card = &em_x270, .codec_dev = &soc_codec_dev_wm9712, }; |