diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
| commit | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch) | |
| tree | 8b8cc6a027353a0f242f61362b35b0942da61b83 /sound/pci/ice1712 | |
| parent | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff) | |
| parent | 5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/pci/ice1712')
| -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 c75515f5be6f..6a9fee3ee78f 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) | |||
| 1100 | } | 1100 | } |
| 1101 | 1101 | ||
| 1102 | #ifdef CONFIG_PM | 1102 | #ifdef CONFIG_PM |
| 1103 | static int __devinit prodigy_hd2_resume(struct snd_ice1712 *ice) | 1103 | static int prodigy_hd2_resume(struct snd_ice1712 *ice) |
| 1104 | { | 1104 | { |
| 1105 | /* initialize ak4396 codec and restore previous mixer volumes */ | 1105 | /* initialize ak4396 codec and restore previous mixer volumes */ |
| 1106 | struct prodigy_hifi_spec *spec = ice->spec; | 1106 | struct prodigy_hifi_spec *spec = ice->spec; |