diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-11-26 08:15:14 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-26 08:15:14 +0100 |
commit | 66eaa6503dcbb56ed9106b26587aafaf3acb3196 (patch) | |
tree | f7b18e903d4f069abb08ff7e0dd4a75ec8fff9d2 /sound | |
parent | 0913f4afe5752cd27fceb6148cf7949aa3aec0bd (diff) | |
parent | 4f199629b0fba95fd5caecbf35ed68417d9a9b7a (diff) |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 53f64eb75ec6..1131c86ad495 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3358,7 +3358,6 @@ int snd_hda_suspend(struct hda_bus *bus, pm_message_t state) /** * snd_hda_resume - resume the codecs * @bus: the HDA bus - * @state: resume state * * Returns 0 if successful. * |