diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 09:15:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 09:15:48 -0800 |
| commit | a2eb473d93971e322a47089ef8df956f51b8936a (patch) | |
| tree | 53f6da3a2f4656a51993a07a07d2ba4ed3b06c87 /sound/pci/ice1712/prodigy_hifi.c | |
| parent | 82abc2a97a4a3c7635c40e6dff571816062ec506 (diff) | |
| parent | 828d44536cd24dfc085a8cf5a12364972398dcd4 (diff) | |
| download | kernel_replicant_linux-a2eb473d93971e322a47089ef8df956f51b8936a.tar.gz kernel_replicant_linux-a2eb473d93971e322a47089ef8df956f51b8936a.tar.bz2 kernel_replicant_linux-a2eb473d93971e322a47089ef8df956f51b8936a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: ice1724 - make some bitfields unsigned
ALSA: hda - Dell Studio 1557 hd-audio quirk
ALSA: ice1724 - Fix section mismatch in prodigy_hd2_resume()
ALSA: hda - Add another Nvidia HDMI codec id (10de:0005)
ALSA: hda: Use model=mb5 for MacBookPro 5,2
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 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) } #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; |