diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-13 15:06:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-13 15:06:04 +0100 |
| commit | 99cbb86180bccd77f331f6e8eb7ce26aeea2cb72 (patch) | |
| tree | dcec4dd738b59a18d524e80e09491bfbf130501e /sound/soc/omap/sdp3430.c | |
| parent | 7c56c29a3bee36f71c7e37de88c9261d61e97e58 (diff) | |
| parent | 14fa43f53ff3a9c3d8b9662574b7369812a31a97 (diff) | |
| download | linux-99cbb86180bccd77f331f6e8eb7ce26aeea2cb72.tar.bz2 | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/omap/sdp3430.c')
| -rw-r--r-- | sound/soc/omap/sdp3430.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index ad97836818b1..e226fa75669c 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c @@ -91,7 +91,7 @@ static struct snd_soc_dai_link sdp3430_dai = { }; /* Audio machine driver */ -static struct snd_soc_machine snd_soc_machine_sdp3430 = { +static struct snd_soc_card snd_soc_sdp3430 = { .name = "SDP3430", .platform = &omap_soc_platform, .dai_link = &sdp3430_dai, @@ -100,7 +100,7 @@ static struct snd_soc_machine snd_soc_machine_sdp3430 = { /* Audio subsystem */ static struct snd_soc_device sdp3430_snd_devdata = { - .machine = &snd_soc_machine_sdp3430, + .card = &snd_soc_sdp3430, .codec_dev = &soc_codec_dev_twl4030, }; |