diff --git a/[refs] b/[refs] index 3f7c6b38199e..89cf1eeba481 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea88663cdcf64bfc14feaf033e902ce3c432156e +refs/heads/master: b1cd9b24e8b010847a081c88960f411bda736b37 diff --git a/trunk/sound/soc/codecs/ad1980.c b/trunk/sound/soc/codecs/ad1980.c index bfbab3d6c35c..4e09c1f2c063 100644 --- a/trunk/sound/soc/codecs/ad1980.c +++ b/trunk/sound/soc/codecs/ad1980.c @@ -141,7 +141,7 @@ static int ac97_write(struct snd_soc_codec *codec, unsigned int reg, return 0; } -struct snd_soc_codec_dai ad1980_dai = { +struct snd_soc_dai ad1980_dai = { .name = "AC97", .playback = { .stream_name = "Playback", diff --git a/trunk/sound/soc/codecs/ad1980.h b/trunk/sound/soc/codecs/ad1980.h index 5d4710db8321..db6c8500d66b 100644 --- a/trunk/sound/soc/codecs/ad1980.h +++ b/trunk/sound/soc/codecs/ad1980.h @@ -17,7 +17,7 @@ #define PR5 0x2000 #define PR6 0x4000 -extern struct snd_soc_codec_dai ad1980_dai; +extern struct snd_soc_dai ad1980_dai; extern struct snd_soc_codec_device soc_codec_dev_ad1980; #endif