diff options
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 @@ | |||
23 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
24 | #include <linux/device.h> | 24 | #include <linux/device.h> |
25 | 25 | ||
26 | #include <sound/driver.h> | ||
27 | #include <sound/core.h> | 26 | #include <sound/core.h> |
28 | #include <sound/pcm.h> | 27 | #include <sound/pcm.h> |
29 | #include <sound/soc.h> | 28 | #include <sound/soc.h> |
@@ -53,15 +52,15 @@ static struct snd_soc_dai_link em_x270_dai[] = { | |||
53 | }, | 52 | }, |
54 | }; | 53 | }; |
55 | 54 | ||
56 | static struct snd_soc_machine em_x270 = { | 55 | static struct snd_soc_card em_x270 = { |
57 | .name = "EM-X270", | 56 | .name = "EM-X270", |
57 | .platform = &pxa2xx_soc_platform, | ||
58 | .dai_link = em_x270_dai, | 58 | .dai_link = em_x270_dai, |
59 | .num_links = ARRAY_SIZE(em_x270_dai), | 59 | .num_links = ARRAY_SIZE(em_x270_dai), |
60 | }; | 60 | }; |
61 | 61 | ||
62 | static struct snd_soc_device em_x270_snd_devdata = { | 62 | static struct snd_soc_device em_x270_snd_devdata = { |
63 | .machine = &em_x270, | 63 | .card = &em_x270, |
64 | .platform = &pxa2xx_soc_platform, | ||
65 | .codec_dev = &soc_codec_dev_wm9712, | 64 | .codec_dev = &soc_codec_dev_wm9712, |
66 | }; | 65 | }; |
67 | 66 | ||