diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/pci/hda/hda_beep.h | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
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 { | |||
| 39 | int snd_hda_attach_beep_device(struct hda_codec *codec, int nid); | 39 | int snd_hda_attach_beep_device(struct hda_codec *codec, int nid); |
| 40 | void snd_hda_detach_beep_device(struct hda_codec *codec); | 40 | void snd_hda_detach_beep_device(struct hda_codec *codec); |
| 41 | #else | 41 | #else |
| 42 | #define snd_hda_attach_beep_device(...) | 42 | #define snd_hda_attach_beep_device(...) 0 |
| 43 | #define snd_hda_detach_beep_device(...) | 43 | #define snd_hda_detach_beep_device(...) |
| 44 | #endif | 44 | #endif |
| 45 | #endif | 45 | #endif |