From e755e24b24def6287016034398f51cba25c91195 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Wed, 1 Jun 2005 02:38:53 -0500
Subject: [PATCH] --- yaml --- r: 3541 b: refs/heads/master c:
 f0f05a42268a8f3dc9dafbcec8ee67f9f8e5cec4 h: refs/heads/master i:   3539:
 c076231afca7d36e5ba6b124d1122c33b128ef1d v: v3

---
 [refs]                  | 2 +-
 trunk/sound/oss/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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