Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[~andy/linux] / sound / Kconfig

diff --git a/sound/Kconfig b/sound/Kconfig
index 1fef141ef8e720ea5f93a6849db18a282f5708d4..c710ce2c5c3703284aef8fb353ce27bdb8c55f6f 100644 (file)
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -52,14 +52,11 @@ config SOUND_OSS_CORE_PRECLAIM
 
          Disabling this allows alternative OSS implementations.
 
-         Please read Documentation/feature-removal-schedule.txt for
-         details.
-
          If unsure, say Y.
 
 source "sound/oss/dmasound/Kconfig"
 
-if !M68K
+if !M68K && !UML
 
 menuconfig SND
        tristate "Advanced Linux Sound Architecture"