diff --git a/[refs] b/[refs]
index 0ff7175261d8..0d5b785a9e06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49d9e77e72cf178644b4db08fa211d8b4715ab13
+refs/heads/master: d4702b189c6b951c1cb3260036ff998f719bfb62
diff --git a/trunk/sound/oss/Kconfig b/trunk/sound/oss/Kconfig
index 5849b129e50d..51c4ba95a32d 100644
--- a/trunk/sound/oss/Kconfig
+++ b/trunk/sound/oss/Kconfig
@@ -250,6 +250,7 @@ config MSND_FIFOSIZE
 menuconfig SOUND_OSS
 	tristate "OSS sound modules"
 	depends on ISA_DMA_API && VIRT_TO_BUS
+	depends on !ISA_DMA_SUPPORT_BROKEN
 	help
 	  OSS is the Open Sound System suite of sound card drivers.  They make
 	  sound programming easier since they provide a common API.  Say Y or