git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: Rename snd_soc_card to snd_soc_machine
[pandora-kernel.git]
/
sound
/
soc
/
blackfin
/
bf5xx-ad73311.c
diff --git
a/sound/soc/blackfin/bf5xx-ad73311.c
b/sound/soc/blackfin/bf5xx-ad73311.c
index
47da49b
..
57da147
100644
(file)
--- a/
sound/soc/blackfin/bf5xx-ad73311.c
+++ b/
sound/soc/blackfin/bf5xx-ad73311.c
@@
-65,7
+65,7
@@
#define GPIO_SE CONFIG_SND_BFIN_AD73311_SE
#define GPIO_SE CONFIG_SND_BFIN_AD73311_SE
-static struct snd_soc_
machine
bf5xx_ad73311;
+static struct snd_soc_
card
bf5xx_ad73311;
static int snd_ad73311_startup(void)
{
static int snd_ad73311_startup(void)
{
@@
-190,7
+190,7
@@
static struct snd_soc_dai_link bf5xx_ad73311_dai = {
.ops = &bf5xx_ad73311_ops,
};
.ops = &bf5xx_ad73311_ops,
};
-static struct snd_soc_
machine
bf5xx_ad73311 = {
+static struct snd_soc_
card
bf5xx_ad73311 = {
.name = "bf5xx_ad73311",
.probe = bf5xx_probe,
.dai_link = &bf5xx_ad73311_dai,
.name = "bf5xx_ad73311",
.probe = bf5xx_probe,
.dai_link = &bf5xx_ad73311_dai,
@@
-198,7
+198,7
@@
static struct snd_soc_machine bf5xx_ad73311 = {
};
static struct snd_soc_device bf5xx_ad73311_snd_devdata = {
};
static struct snd_soc_device bf5xx_ad73311_snd_devdata = {
- .
machine
= &bf5xx_ad73311,
+ .
card
= &bf5xx_ad73311,
.platform = &bf5xx_i2s_soc_platform,
.codec_dev = &soc_codec_dev_ad73311,
};
.platform = &bf5xx_i2s_soc_platform,
.codec_dev = &soc_codec_dev_ad73311,
};