diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-21 07:42:49 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-21 07:42:49 +0200 |
| commit | f22d806b6cc0c74dd0a1a21b3f311dba51d9df84 (patch) | |
| tree | dcc11baa299cb60a8aa06e909ab1ef847ec2a85f /sound/soc/codecs/wm9705.c | |
| parent | 9bc5df222b9cfc4be1176e566dfba2ab5c6b43f8 (diff) | |
| parent | 516ef69f160fb2f092d71f2cb635a9394ff8a71a (diff) | |
| download | kernel_samsung_smdk4412-f22d806b6cc0c74dd0a1a21b3f311dba51d9df84.zip kernel_samsung_smdk4412-f22d806b6cc0c74dd0a1a21b3f311dba51d9df84.tar.gz kernel_samsung_smdk4412-f22d806b6cc0c74dd0a1a21b3f311dba51d9df84.tar.bz2 | |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: Fix warning in wm9705
ASoC: OMAP: Update contact addresses
ASoC: pxa-ssp: Don't use SSCR0_SerClkDiv and SSCR0_SCR
Diffstat (limited to 'sound/soc/codecs/wm9705.c')
| -rw-r--r-- | sound/soc/codecs/wm9705.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 6e23a81..c2d1a7a 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -318,7 +318,7 @@ static int wm9705_reset(struct snd_soc_codec *codec) } #ifdef CONFIG_PM -static int wm9705_soc_suspend(struct platform_device *pdev) +static int wm9705_soc_suspend(struct platform_device *pdev, pm_message_t msg) { struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_codec *codec = socdev->card->codec; |