Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[mirror_ubuntu-artful-kernel.git] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index 1fef141ef8e720ea5f93a6849db18a282f5708d4..261a03c8a2095f36bcac187230e91e328bf11545 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -59,7 +59,7 @@ config SOUND_OSS_CORE_PRECLAIM
 
 source "sound/oss/dmasound/Kconfig"
 
-if !M68K
+if !M68K && !UML
 
 menuconfig SND
        tristate "Advanced Linux Sound Architecture"