summaryrefslogtreecommitdiff
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-14 08:14:32 +0200
committerTakashi Iwai <tiwai@suse.de>2011-06-14 08:14:32 +0200
commitca2585afa013ec2cf99a48e46d6b82df2e240493 (patch)
tree0ad3e780055338a0576d19b6e3d159d5f7104ba8 /sound/pci
parent37f7ec38ea5c31180461f82e895e13fdd549b595 (diff)
downloadlinux-3.10-ca2585afa013ec2cf99a48e46d6b82df2e240493.tar.gz
linux-3.10-ca2585afa013ec2cf99a48e46d6b82df2e240493.tar.bz2
linux-3.10-ca2585afa013ec2cf99a48e46d6b82df2e240493.zip
ALSA: hda - Fix missing static inline to beep dummy function
The commit 2308f4add3de9f6c9c9f02e49461e94d84bb200a missed static inline thus it resulted in multiple-definitions error at linking. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_beep.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 4967eabe774..55f0647458c 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -54,7 +54,7 @@ static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid)
{
return 0;
}
-void snd_hda_detach_beep_device(struct hda_codec *codec)
+static inline void snd_hda_detach_beep_device(struct hda_codec *codec)
{
}
#endif