Automatic merge of 'for-linus' branch from

	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input

1 files changed, 6 insertions, 6 deletions

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index a9602f89d6b1..e537bd66a707 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -112,7 +112,7 @@ config SOUND_BCM_CS4297A
 
 config SOUND_ES1370
         tristate "Ensoniq AudioPCI (ES1370)"
-        depends on SOUND_PRIME!=n && SOUND && PCI && SOUND_GAMEPORT
+        depends on SOUND_PRIME!=n && SOUND && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the Ensoniq
           ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
@@ -125,7 +125,7 @@ config SOUND_ES1370
 
 config SOUND_ES1371
         tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
-        depends on SOUND_PRIME!=n && SOUND && PCI && SOUND_GAMEPORT
+        depends on SOUND_PRIME!=n && SOUND && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the Ensoniq
           ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
@@ -138,7 +138,7 @@ config SOUND_ES1371
 
 config SOUND_ESSSOLO1
         tristate "ESS Technology Solo1" 
-        depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT && PCI
+        depends on SOUND_PRIME!=n && SOUND && PCI
         help
           Say Y or M if you have a PCI sound card utilizing the ESS Technology
           Solo1 chip. To find out if your sound card uses a
@@ -179,7 +179,7 @@ config SOUND_HARMONY
 
 config SOUND_SONICVIBES
         tristate "S3 SonicVibes"
-        depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT
+        depends on SOUND_PRIME!=n && SOUND
         help
           Say Y or M if you have a PCI sound card utilizing the S3
           SonicVibes chipset. To find out if your sound card uses a
@@ -226,7 +226,7 @@ config SOUND_AU1550_AC97
 
 config SOUND_TRIDENT
         tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
-        depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT
+        depends on SOUND_PRIME!=n && SOUND
         ---help---
           Say Y or M if you have a PCI sound card utilizing the Trident
           4DWave-DX/NX chipset or your mother board chipset has SiS 7018
@@ -739,7 +739,7 @@ config SOUND_NM256
 
 config SOUND_MAD16
         tristate "OPTi MAD16 and/or Mozart based cards"
-        depends on SOUND_OSS && SOUND_GAMEPORT
+        depends on SOUND_OSS
         ---help---
           Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi
           82C928 or 82C929 or 82C931) audio interface chip. These chips are