Merge branch 'master' into tk71

[mv-sheeva.git] / sound / soc / txx9 / txx9aclc.h

diff --git a/sound/soc/txx9/txx9aclc.h b/sound/soc/txx9/txx9aclc.h
index 6769aab41b331d60f77b412369cb68823aa3b8c6..9c2de84fec3bbae4bd529f977b4aeab648f38129 100644 (file)
--- a/sound/soc/txx9/txx9aclc.h
+++ b/sound/soc/txx9/txx9aclc.h
@@ -65,19 +65,10 @@ struct txx9aclc_plat_drvdata {
        u64 physbase;
 };
 
-struct txx9aclc_soc_device {
-       struct snd_soc_device soc_dev;
-       struct platform_device *aclc_pdev;      /* for ioresources, drvdata */
-       struct txx9aclc_dmadata dmadata[2];
-};
-
 static inline struct txx9aclc_plat_drvdata *txx9aclc_get_plat_drvdata(
-       struct txx9aclc_soc_device *sdev)
+       struct snd_soc_dai *dai)
 {
-       return platform_get_drvdata(sdev->aclc_pdev);
+       return dev_get_drvdata(dai->dev);
 }
 
-extern struct snd_soc_platform txx9aclc_soc_platform;
-extern struct snd_soc_dai txx9aclc_ac97_dai;
-
 #endif /* __TXX9ACLC_H */