diff options
author | David S. Miller <davem@davemloft.net> | 2011-06-21 07:29:08 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-21 07:29:08 +0200 |
commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /sound/pci/hda/hda_beep.h | |
parent | gianfar v5: implement nfc (diff) | |
parent | Linux 3.0-rc4 (diff) | |
download | linux-9f6ec8d697c08963d83880ccd35c13c5ace716ea.tar.xz linux-9f6ec8d697c08963d83880ccd35c13c5ace716ea.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'sound/pci/hda/hda_beep.h')
-rw-r--r-- | sound/pci/hda/hda_beep.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h index f1de1bac042c..55f0647458c7 100644 --- a/sound/pci/hda/hda_beep.h +++ b/sound/pci/hda/hda_beep.h @@ -50,7 +50,12 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable); int snd_hda_attach_beep_device(struct hda_codec *codec, int nid); void snd_hda_detach_beep_device(struct hda_codec *codec); #else -#define snd_hda_attach_beep_device(...) 0 -#define snd_hda_detach_beep_device(...) +static inline int snd_hda_attach_beep_device(struct hda_codec *codec, int nid) +{ + return 0; +} +static inline void snd_hda_detach_beep_device(struct hda_codec *codec) +{ +} #endif #endif |