diff options
| author | Andy Green <andy@openmoko.com> | 2009-01-27 14:39:18 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-27 14:39:18 +0000 |
| commit | b68e19ab0a3704aeb9eefdff1bbe0692a5c248b2 (patch) | |
| tree | e823f06c43c30c5e3586db7cd0b427d9b6c1b41a /sound/soc/s3c24xx | |
| parent | b23d50393d1817cd082e0b2d91b7467026800faf (diff) | |
tracking-2.6.29-rc2-soc-card-vs-machine-struct.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'sound/soc/s3c24xx')
| -rw-r--r-- | sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index dba635e12da..79b6b6c27d4 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -56,7 +56,7 @@ #define NEO_CAPTURE_BLUETOOTH 8 #define NEO_STEREO_TO_HANDSET_SPK 9 -static struct snd_soc_machine neo1973_gta02; +static struct snd_soc_card neo1973_gta02; static int neo1973_gta02_hifi_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) @@ -550,7 +550,6 @@ static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec) static struct snd_soc_dai bt_dai = { .name = "Bluetooth", .id = 0, - .type = SND_SOC_DAI_PCM, .playback = { .channels_min = 1, .channels_max = 1, @@ -601,8 +600,9 @@ int neo1973_gta02_resume(struct platform_device *pdev) #define neo1973_gta02_resume NULL #endif -static struct snd_soc_machine neo1973_gta02 = { +static struct snd_soc_card neo1973_gta02 = { .name = "neo1973-gta02", + .platform = &s3c24xx_soc_platform, .suspend_pre = neo1973_gta02_suspend, .resume_post = neo1973_gta02_resume, .dai_link = neo1973_gta02_dai, @@ -618,8 +618,7 @@ static struct wm8753_setup_data soc_codec_data_wm8753_gta02 = { }; static struct snd_soc_device neo1973_gta02_snd_devdata = { - .machine = &neo1973_gta02, - .platform = &s3c24xx_soc_platform, + .card = &neo1973_gta02, .codec_dev = &soc_codec_dev_wm8753, .codec_data = &soc_codec_data_wm8753_gta02, }; |