vserver 2.0 rc7

[linux-2.6.git] / drivers / input / gameport / Kconfig

diff --git a/drivers/input/gameport/Kconfig b/drivers/input/gameport/Kconfig
index 4473553..1d93f50 100644 (file)
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
@@ -19,30 +19,10 @@ config GAMEPORT
          To compile this driver as a module, choose M here: the
          module will be called gameport.
 
-
-# Yes, SOUND_GAMEPORT looks a bit odd. Yes, it ends up being turned on
-# in every .config. Please don't touch it. It is here to handle an
-# unusual dependency between GAMEPORT and sound drivers.
-#
-# Some sound drivers call gameport functions. If GAMEPORT is
-# not selected, empty stubs are provided for the functions and all is
-# well.
-# If GAMEPORT is built in, everything is fine.
-# If GAMEPORT is a module, however, it would need to be loaded for the
-# sound driver to be able to link properly. Therefore, the sound
-# driver must be a module as well in that case. Since there's no way
-# to express that directly in Kconfig, we use SOUND_GAMEPORT to
-# express it. SOUND_GAMEPORT boils down to "if GAMEPORT is 'm',
-# anything that depends on SOUND_GAMEPORT must be 'm' as well. if
-# GAMEPORT is 'y' or 'n', it can be anything".
-config SOUND_GAMEPORT
-       tristate
-       default y if GAMEPORT!=m
-       default m if GAMEPORT=m
+if GAMEPORT
 
 config GAMEPORT_NS558
        tristate "Classic ISA and PnP gameport support"
-       depends on GAMEPORT
        help
          Say Y here if you have an ISA or PnP gameport.
 
@@ -53,7 +33,6 @@ config GAMEPORT_NS558
 
 config GAMEPORT_L4
        tristate "PDPI Lightning 4 gamecard support"
-       depends on GAMEPORT
        help
          Say Y here if you have a PDPI Lightning 4 gamecard.
 
@@ -62,7 +41,7 @@ config GAMEPORT_L4
 
 config GAMEPORT_EMU10K1
        tristate "SB Live and Audigy gameport support"
-       depends on GAMEPORT
+       depends on PCI
        help
          Say Y here if you have a SoundBlaster Live! or SoundBlaster
          Audigy card and want to use its gameport.
@@ -72,7 +51,7 @@ config GAMEPORT_EMU10K1
 
 config GAMEPORT_VORTEX
        tristate "Aureal Vortex, Vortex 2 gameport support"
-       depends on GAMEPORT
+       depends on PCI
        help
          Say Y here if you have an Aureal Vortex 1 or 2  card and want
          to use its gameport.
@@ -82,9 +61,10 @@ config GAMEPORT_VORTEX
 
 config GAMEPORT_FM801
        tristate "ForteMedia FM801 gameport support"
-       depends on GAMEPORT
+       depends on PCI
 
 config GAMEPORT_CS461X
        tristate "Crystal SoundFusion gameport support"
-       depends on GAMEPORT
+       depends on PCI
 
+endif