diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-16 17:38:41 +0100 |
| commit | 27b92d4ff2be2359a21ff4acde5b63563ff720e2 (patch) | |
| tree | 49691b22fe1318aa68d5ebdff74795f004f0cf8f /sound/soc/pxa/tosa.c | |
| parent | 5de0ee574be8f6922a6c33f2fbc7e9b130a2f626 (diff) | |
| parent | e58a8947b0264ec1f43ce5deef563b72acf1284f (diff) | |
| download | kernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.zip kernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.gz kernel_samsung_tuna-27b92d4ff2be2359a21ff4acde5b63563ff720e2.tar.bz2 | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/tosa.c')
| -rw-r--r-- | sound/soc/pxa/tosa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 4b6e5d6..9a23513 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -237,7 +237,7 @@ static struct snd_soc_dai_link tosa_dai[] = { }, }; -static int tosa_probe(struct platform_device *dev) +static int tosa_probe(struct snd_soc_card *card) { int ret; @@ -251,7 +251,7 @@ static int tosa_probe(struct platform_device *dev) return ret; } -static int tosa_remove(struct platform_device *dev) +static int tosa_remove(struct snd_soc_card *card) { gpio_free(TOSA_GPIO_L_MUTE); return 0; |