aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-06-01 02:38:53 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2005-06-01 02:38:53 -0500
commitf0f05a42268a8f3dc9dafbcec8ee67f9f8e5cec4 (patch)
tree1433657676604d33473d84ae868d267493ec59a8
parente608460dee4c2de3a01f67c1bac21adb61d617e3 (diff)
downloadlinux-2.6.34-ux500-f0f05a42268a8f3dc9dafbcec8ee67f9f8e5cec4.tar.gz
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>
-rw-r--r--sound/oss/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index e537bd66a70..33e28089f8d 100644
--- 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