Merge branch 'for-linus' into for-next

[thirdparty/linux.git] / sound / core / Makefile

diff --git a/sound/core/Makefile b/sound/core/Makefile
index a6b444ee283264ca60e8d5673c4378f6175f128c..b8aa886198ab084d38ca2fefca8afe88154752c3 100644 (file)
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -32,7 +32,6 @@ snd-ump-objs      := ump.o
 snd-ump-$(CONFIG_SND_UMP_LEGACY_RAWMIDI) += ump_convert.o
 snd-timer-objs    := timer.o
 snd-hrtimer-objs  := hrtimer.o
-snd-rtctimer-objs := rtctimer.o
 snd-hwdep-objs    := hwdep.o
 snd-seq-device-objs := seq_device.o
 
@@ -49,6 +48,8 @@ obj-$(CONFIG_SND_SEQ_DEVICE)  += snd-seq-device.o
 obj-$(CONFIG_SND_RAWMIDI)      += snd-rawmidi.o
 obj-$(CONFIG_SND_UMP)          += snd-ump.o
 
+obj-$(CONFIG_SND_CORE_TEST)    += sound_kunit.o
+
 obj-$(CONFIG_SND_OSSEMUL)      += oss/
 obj-$(CONFIG_SND_SEQUENCER)    += seq/