git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ALSA: seq: Allow the tristate build of OSS emulation
[sfrench/cifs-2.6.git]
/
sound
/
synth
/
emux
/
emux_oss.c
diff --git
a/sound/synth/emux/emux_oss.c
b/sound/synth/emux/emux_oss.c
index 850fab4a8f3b5d4a17f51f9a4521fbd0cf624709..de19e108974a432ec9f796f6c8dc5a1b99dec707 100644
(file)
--- a/
sound/synth/emux/emux_oss.c
+++ b/
sound/synth/emux/emux_oss.c
@@
-23,8
+23,6
@@
*/
-#ifdef CONFIG_SND_SEQUENCER_OSS
-
#include <linux/export.h>
#include <linux/uaccess.h>
#include <sound/core.h>
@@
-505,5
+503,3
@@
fake_event(struct snd_emux *emu, struct snd_emux_port *port, int ch, int param,
ev.data.control.value = val;
snd_emux_event_input(&ev, 0, port, atomic, hop);
}
-
-#endif /* CONFIG_SND_SEQUENCER_OSS */