summaryrefslogtreecommitdiffstats
path: root/sound/isa/gus/gus_main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 08:41:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-28 08:41:58 -0700
commit7b70888a192eff457c2ca0a4ffa04815f5e19734 (patch)
tree8c75d6908b1e83b750b50e7a26da867926e0f5cd /sound/isa/gus/gus_main.c
parentcd85c8b4457a52d3545fdb9532082b2c1ebd5f21 (diff)
parent0a97af41b0e77f834acc0870155de616a373e899 (diff)
downloadop-kernel-dev-7b70888a192eff457c2ca0a4ffa04815f5e19734.zip
op-kernel-dev-7b70888a192eff457c2ca0a4ffa04815f5e19734.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/isa/gus/gus_main.c')
-rw-r--r--sound/isa/gus/gus_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 94bbd34..a636d9c 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -417,11 +417,13 @@ static int snd_gus_check_version(snd_gus_card_t * gus)
return 0;
}
+#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
static void snd_gus_seq_dev_free(snd_seq_device_t *seq_dev)
{
snd_gus_card_t *gus = seq_dev->private_data;
gus->seq_dev = NULL;
}
+#endif
int snd_gus_initialize(snd_gus_card_t *gus)
{
OpenPOWER on IntegriCloud