diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/soc/txx9/txx9aclc.h | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/soc/txx9/txx9aclc.h')
-rw-r--r-- | sound/soc/txx9/txx9aclc.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sound/soc/txx9/txx9aclc.h b/sound/soc/txx9/txx9aclc.h index 6769aab41b33..9c2de84fec3b 100644 --- a/sound/soc/txx9/txx9aclc.h +++ b/sound/soc/txx9/txx9aclc.h | |||
@@ -65,19 +65,10 @@ struct txx9aclc_plat_drvdata { | |||
65 | u64 physbase; | 65 | u64 physbase; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | struct txx9aclc_soc_device { | ||
69 | struct snd_soc_device soc_dev; | ||
70 | struct platform_device *aclc_pdev; /* for ioresources, drvdata */ | ||
71 | struct txx9aclc_dmadata dmadata[2]; | ||
72 | }; | ||
73 | |||
74 | static inline struct txx9aclc_plat_drvdata *txx9aclc_get_plat_drvdata( | 68 | static inline struct txx9aclc_plat_drvdata *txx9aclc_get_plat_drvdata( |
75 | struct txx9aclc_soc_device *sdev) | 69 | struct snd_soc_dai *dai) |
76 | { | 70 | { |
77 | return platform_get_drvdata(sdev->aclc_pdev); | 71 | return dev_get_drvdata(dai->dev); |
78 | } | 72 | } |
79 | 73 | ||
80 | extern struct snd_soc_platform txx9aclc_soc_platform; | ||
81 | extern struct snd_soc_dai txx9aclc_ac97_dai; | ||
82 | |||
83 | #endif /* __TXX9ACLC_H */ | 74 | #endif /* __TXX9ACLC_H */ |