diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:09 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:09 +0100 |
commit | e7bfbb0215ee9b2fc976f7f51e20a8ae02b1d839 (patch) | |
tree | 469e5a5c9ce609e7109548a2f40d04528740d54b /sound/pci/hda/hda_beep.h | |
parent | fe506d6bc5d7b9c0c1d630eecb32241c1d362462 (diff) | |
parent | 9b6682ff4c69484b6955f89f7902e3dde2481bed (diff) | |
download | linux-e7bfbb0215ee9b2fc976f7f51e20a8ae02b1d839.tar.gz linux-e7bfbb0215ee9b2fc976f7f51e20a8ae02b1d839.tar.bz2 linux-e7bfbb0215ee9b2fc976f7f51e20a8ae02b1d839.zip |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_beep.h')
-rw-r--r-- | sound/pci/hda/hda_beep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h index b9679f081cae..51bf6a5daf39 100644 --- a/sound/pci/hda/hda_beep.h +++ b/sound/pci/hda/hda_beep.h @@ -39,7 +39,7 @@ struct hda_beep { 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(...) +#define snd_hda_attach_beep_device(...) 0 #define snd_hda_detach_beep_device(...) #endif #endif |