diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 14:49:36 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 14:49:36 -0700 |
commit | 2cfcadde83b308240690ff1c18f117d8bc7a08b0 (patch) | |
tree | aa0795966d070d1f7a5221232d9ba47744bddb5f /sound/pci/ice1712/prodigy_hifi.c | |
parent | e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 (diff) | |
parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
download | kernel_samsung_smdk4412-2cfcadde83b308240690ff1c18f117d8bc7a08b0.zip kernel_samsung_smdk4412-2cfcadde83b308240690ff1c18f117d8bc7a08b0.tar.gz kernel_samsung_smdk4412-2cfcadde83b308240690ff1c18f117d8bc7a08b0.tar.bz2 |
Merge commit 'v2.6.32-rc8'
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 c75515f..6a9fee3 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; |