summaryrefslogtreecommitdiffstats
path: root/sound/firewire/oxfw/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-11-02 09:00:37 +0100
committerTakashi Iwai <tiwai@suse.de>2015-11-02 09:00:37 +0100
commitbc88c9e923819b02f8cfaec1bb80d7e5530c0ac5 (patch)
tree1731a322d153ee18017822a8fd66295a0ec7a4e2 /sound/firewire/oxfw/Makefile
parentcadd16ea33a938d49aee99edd4758cc76048b399 (diff)
parent2c8d08925272b9be383cd81f1973c6faf9fbf53a (diff)
downloadop-kernel-dev-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.zip
op-kernel-dev-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.gz
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/firewire/oxfw/Makefile')
-rw-r--r--sound/firewire/oxfw/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/oxfw/Makefile b/sound/firewire/oxfw/Makefile
index a926850..06ff50f 100644
--- a/sound/firewire/oxfw/Makefile
+++ b/sound/firewire/oxfw/Makefile
@@ -1,3 +1,3 @@
snd-oxfw-objs := oxfw-command.o oxfw-stream.o oxfw-control.o oxfw-pcm.o \
oxfw-proc.o oxfw-midi.o oxfw-hwdep.o oxfw.o
-obj-m += snd-oxfw.o
+obj-$(CONFIG_SND_OXFW) += snd-oxfw.o
OpenPOWER on IntegriCloud