Merge branch 'topic/drop-l3' into for-linus
[linux-2.6.git] / sound / soc / blackfin / bf5xx-ad1980.c
index 124425d223202aeb308a45023616e26a152dc4c0..d8f5912737788d871c1fd6478d45cc64a4c7ee79 100644 (file)
@@ -43,7 +43,7 @@
 #include "bf5xx-ac97-pcm.h"
 #include "bf5xx-ac97.h"
 
-static struct snd_soc_machine bf5xx_board;
+static struct snd_soc_card bf5xx_board;
 
 static int bf5xx_board_startup(struct snd_pcm_substream *substream)
 {
@@ -67,15 +67,15 @@ static struct snd_soc_dai_link bf5xx_board_dai = {
        .ops = &bf5xx_board_ops,
 };
 
-static struct snd_soc_machine bf5xx_board = {
+static struct snd_soc_card bf5xx_board = {
        .name = "bf5xx-board",
+       .platform = &bf5xx_ac97_soc_platform,
        .dai_link = &bf5xx_board_dai,
        .num_links = 1,
 };
 
 static struct snd_soc_device bf5xx_board_snd_devdata = {
-       .machine = &bf5xx_board,
-       .platform = &bf5xx_ac97_soc_platform,
+       .card = &bf5xx_board,
        .codec_dev = &soc_codec_dev_ad1980,
 };