Makefile/config.in changes to reflect the new drivers.

diff --git a/drivers/input/gameport/Config.help b/drivers/input/gameport/Config.help
index 54cac2482adfc0396a9d47300ca49694ce467c22..2d66d4e98260e7ffbcf05135329c2f5722521d85 100644 (file)
--- a/drivers/input/gameport/Config.help
+++ b/drivers/input/gameport/Config.help
@@ -43,13 +43,13 @@ CONFIG_GAMEPORT_EMU10K1
   The module will be called emu10k1-gp.o. If you want to compile it as
   a module, say M here and read <file:Documentation/modules.txt>.
 
-CONFIG_GAMEPORT_PCIGAME
-  Say Y here if you have an Aureal Vortex 1 or 2 or a Trident
-  4DWave NX or DX card and want to use its gameport.
+CONFIG_GAMEPORT_VORTEX
+  Say Y here if you have an Aureal Vortex 1 or 2  card and want
+  to use its gameport.
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called pcigame.o. If you want to compile it as a
+  The module will be called vortex.o. If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
 CONFIG_GAMEPORT_CS461X

diff --git a/drivers/input/gameport/Config.in b/drivers/input/gameport/Config.in
index df89f6a6f189524a5442c49f8afc6c80dbe455eb..eeb983ec42a5b1e7e2a1612859ba252096947cb0 100644 (file)
--- a/drivers/input/gameport/Config.in
+++ b/drivers/input/gameport/Config.in
@@ -14,6 +14,6 @@ fi
 dep_tristate '  Classic ISA and PnP gameport support' CONFIG_GAMEPORT_NS558 $CONFIG_GAMEPORT
 dep_tristate '  PDPI Lightning 4 gamecard support' CONFIG_GAMEPORT_L4 $CONFIG_GAMEPORT
 dep_tristate '  SB Live and Audigy gameport support' CONFIG_INPUT_EMU10K1 $CONFIG_GAMEPORT
-dep_tristate '  Aureal Vortex, Vortex 2 and Trident 4DWave NX/DX gameport support' CONFIG_GAMEPORT_PCIGAME $CONFIG_GAMEPORT
+dep_tristate '  Aureal Vortex, Vortex 2 gameport support' CONFIG_GAMEPORT_VORTEX $CONFIG_GAMEPORT
 dep_tristate '  ForteMedia FM801 gameport support' CONFIG_GAMEPORT_FM801 $CONFIG_GAMEPORT
 dep_tristate '  Crystal SoundFusion gameport support' CONFIG_GAMEPORT_CS461x $CONFIG_GAMEPORT

diff --git a/drivers/input/gameport/Makefile b/drivers/input/gameport/Makefile
index 60509253a031da0c10c542b9b7853a42f828534d..ac1991701f6a2b0d3a1d36dcb0627ddada5943ba 100644 (file)
--- a/drivers/input/gameport/Makefile
+++ b/drivers/input/gameport/Makefile
@@ -11,9 +11,10 @@ export-objs  := gameport.o
 obj-$(CONFIG_GAMEPORT)         += gameport.o
 obj-$(CONFIG_GAMEPORT_CS461X)  += cs461x.o
 obj-$(CONFIG_GAMEPORT_EMU10K1) += emu10k1-gp.o
+obj-$(CONFIG_GAMEPORT_FM801)   += fm801-gp.o
 obj-$(CONFIG_GAMEPORT_L4)      += lightning.o
 obj-$(CONFIG_GAMEPORT_NS558)   += ns558.o
-obj-$(CONFIG_GAMEPORT_PCIGAME) += pcigame.o
+obj-$(CONFIG_GAMEPORT_VORTEX)  += vortex.o
 
 # The global Rules.make.