CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/sh/sh7760-ac97.c

 /*
  * Generic AC97 sound support for SH7760
  *
  * (c) 2007 Manuel Lauss
  *
  * Licensed under the GPLv2.
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <asm/io.h>
 
 #define IPSEL 0xFE400034
 
 /* platform specific structs can be declared here */
 extern struct snd_soc_dai_driver sh4_hac_dai[2];
 extern struct snd_soc_platform_driver sh7760_soc_platform;
 
 static int machine_init(struct snd_soc_pcm_runtime *rtd)
 {
-        snd_soc_dapm_sync(rtd->codec);
+        snd_soc_dapm_sync(&rtd->codec->dapm);
         return 0;
 }
 
 static struct snd_soc_dai_link sh7760_ac97_dai = {
         .name = "AC97",
         .stream_name = "AC97 HiFi",
         .cpu_dai_name = "hac-dai.0",    /* HAC0 */
         .codec_dai_name = "ac97-hifi",
         .platform_name = "sh7760-pcm-audio",
         .codec_name = "ac97-codec",
@@ skipping 38 matching lines @@
 {
         platform_device_unregister(sh7760_ac97_snd_device);
 }
 
 module_init(sh7760_ac97_init);
 module_exit(sh7760_ac97_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Generic SH7760 AC97 sound machine");
 MODULE_AUTHOR("Manuel Lauss <mano@roarinelk.homelinux.net>");