diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 14:52:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-12-26 14:52:54 +0000 |
| commit | 7f50548abb5454bd82c25aae15f0a3bf6a530f46 (patch) | |
| tree | 175b5d695437151f0f9f778ad8eb7f274468842f /sound/pci/ice1712/prodigy_hifi.c | |
| parent | b3172f222ab5afdc91ea058bd11c42cf169728f3 (diff) | |
| parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) | |
| download | kernel_samsung_smdk4412-7f50548abb5454bd82c25aae15f0a3bf6a530f46.tar.gz kernel_samsung_smdk4412-7f50548abb5454bd82c25aae15f0a3bf6a530f46.tar.bz2 kernel_samsung_smdk4412-7f50548abb5454bd82c25aae15f0a3bf6a530f46.zip | |
Merge commit 'v2.6.33-rc2' into for-2.6.33
Diffstat (limited to 'sound/pci/ice1712/prodigy_hifi.c')
| -rw-r--r-- | sound/pci/ice1712/prodigy_hifi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c index c75515f5be6..6a9fee3ee78 100644 --- a/sound/pci/ice1712/prodigy_hifi.c +++ b/sound/pci/ice1712/prodigy_hifi.c @@ -1100,7 +1100,7 @@ static void ak4396_init(struct snd_ice1712 *ice) } #ifdef CONFIG_PM -static int __devinit prodigy_hd2_resume(struct snd_ice1712 *ice) +static int prodigy_hd2_resume(struct snd_ice1712 *ice) { /* initialize ak4396 codec and restore previous mixer volumes */ struct prodigy_hifi_spec *spec = ice->spec; |