2002-02-26 19:26:21

by Steven Cole

Subject: [PATCH] 2.5.5-dj1, small fix in drivers/input/gameport/Config.in

While looking through the Config.in files in 2.5.5-dj1 for missing
help texts in Config.help, I found that in drivers/input/gameport
we have both CONFIG_GAMEPORT_EMU10K1 and CONFIG_INPUT_EMU10K1,
and perhaps only one of these is needed.

Here is a snippet from the drivers/input/gameport/Makefile:

obj-$(CONFIG_GAMEPORT_CS614X) += cs614x.o
obj-$(CONFIG_GAMEPORT_EMU10K1) += emu10k1-gp.o
obj-$(CONFIG_GAMEPORT_FM801) += fm801-gp.o

There is no help text for CONFIG_INPUT_EMU10K1, but there is
one for CONFIG_GAMEPORT_EMU10K1 in drivers/input/gameport/Config.help.
However, drivers/input/gameport/Config.in prompts for a setting for
CONFIG_INPUT_EMU10K1.

The following micro-patch is proposed:

Steven

--- linux-2.5.5-dj1/drivers/input/gameport/Config.in.orig Tue Feb 26 12:01:38 2002
+++ linux-2.5.5-dj1/drivers/input/gameport/Config.in Tue Feb 26 12:02:09 2002
@@ -13,7 +13,7 @@

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 ' SB Live and Audigy gameport support' CONFIG_GAMEPORT_EMU10K1 $CONFIG_GAMEPORT
dep_tristate ' Aureal Vortex and 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

2002-02-26 20:12:15

by Steven Cole

Subject: Re: [PATCH] 2.5.5-dj1, small fix in drivers/input/gameport/Config.in

On Tuesday 26 February 2002 12:24 pm, Steven Cole wrote:
> While looking through the Config.in files in 2.5.5-dj1 for missing
> help texts in Config.help, I found that in drivers/input/gameport
> we have both CONFIG_GAMEPORT_EMU10K1 and CONFIG_INPUT_EMU10K1,
> and perhaps only one of these is needed.
>
> Here is a snippet from the drivers/input/gameport/Makefile:
>
> obj-$(CONFIG_GAMEPORT_CS614X) += cs614x.o
> obj-$(CONFIG_GAMEPORT_EMU10K1) += emu10k1-gp.o
> obj-$(CONFIG_GAMEPORT_FM801) += fm801-gp.o
>
> There is no help text for CONFIG_INPUT_EMU10K1, but there is
> one for CONFIG_GAMEPORT_EMU10K1 in drivers/input/gameport/Config.help.
> However, drivers/input/gameport/Config.in prompts for a setting for
> CONFIG_INPUT_EMU10K1.
>
> The following micro-patch is proposed:

[first patch snipped, I found more fixes]

After looking at this some more, I found that the lower case x
in CONFIG_GAMEPORT_CS461x in the Config.in file caused problems,
and the obj-$(CONFIG_GAMEPORT_CS614X) += cs614x.o in the Makefile
appears to be a case of numeric dyslexia,
where obj-$(CONFIG_GAMEPORT_CS461X) += cs461x.o is what is really desired.

If this is correct, please apply.

Here is a set of proposed fixes:
Steven

--- linux-2.5.5-dj1/drivers/input/gameport/Config.in.orig Tue Feb 26 12:01:38 2002
+++ linux-2.5.5-dj1/drivers/input/gameport/Config.in Tue Feb 26 12:53:39 2002
@@ -13,7 +13,7 @@

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 ' SB Live and Audigy gameport support' CONFIG_GAMEPORT_EMU10K1 $CONFIG_GAMEPORT
dep_tristate ' Aureal Vortex and 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
+dep_tristate ' Crystal SoundFusion gameport support' CONFIG_GAMEPORT_CS461X $CONFIG_GAMEPORT

--- linux-2.5.5-dj1/drivers/input/gameport/Makefile.orig Tue Feb 26 12:56:17 2002
+++ linux-2.5.5-dj1/drivers/input/gameport/Makefile Tue Feb 26 12:56:43 2002
@@ -13,7 +13,7 @@
# Each configuration option enables a list of files.

obj-$(CONFIG_GAMEPORT) += gameport.o
-obj-$(CONFIG_GAMEPORT_CS614X) += cs614x.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