diff --git a/[refs] b/[refs]
index babd70c3f60f..6c9384c08a11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37f7ec38ea5c31180461f82e895e13fdd549b595
+refs/heads/master: ca2585afa013ec2cf99a48e46d6b82df2e240493
diff --git a/trunk/sound/pci/hda/hda_beep.h b/trunk/sound/pci/hda/hda_beep.h
index 4967eabe774e..55f0647458c7 100644
--- a/trunk/sound/pci/hda/hda_beep.h
+++ b/trunk/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