Auto merge with /home/aegl/GIT/ia64-test

[linux-2.6] / sound / oss / Kconfig

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 3b1fafc8f4f56c91417b7728ea998b0c3f438412..7bd95ceab7cc62ab59339a4854dc0bc834b0eebd 100644 (file)
--- a/sound/oss/Kconfig
+++ b/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