diff --git a/[refs] b/[refs]
index f7c331a1a93f..6e86d54cd70e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e608460dee4c2de3a01f67c1bac21adb61d617e3
+refs/heads/master: f0f05a42268a8f3dc9dafbcec8ee67f9f8e5cec4
diff --git a/trunk/sound/oss/Kconfig b/trunk/sound/oss/Kconfig
index e537bd66a707..33e28089f8d7 100644
--- a/trunk/sound/oss/Kconfig
+++ b/trunk/sound/oss/Kconfig
@@ -52,7 +52,7 @@ config SOUND_CMPCI_MIDI
 
 config SOUND_CMPCI_JOYSTICK
 	bool "Enable joystick"
-	depends on SOUND_CMPCI && X86
+	depends on SOUND_CMPCI && X86 && (GAMEPORT=y || SOUND_CMPCI=GAMEPORT)
 	help
 	  Say Y here in order to enable the joystick port on a sound card using
 	  the CMI8338 or the CMI8738 chipset.  You need to config the