Input: make sure that joystick support in CMPCI driver can only be
       selected if either gameport is built-in or _both_ gameport
       and cmpci are built as modules.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index e537bd6..33e2808 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -52,7 +52,7 @@
 
 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