[PATCH] CS461x gameport code isn't being included in build

[PATCH] CS461x gameport code isn't being included in build

[Ron Murray]

    I've found a typo in drivers/input/gameport/Makefile in kernel
2.6.9 which effectively prevents the CS461x gameport code from
being included. Here's the diff:

--- linux-2.6.9/drivers/input/gameport/Makefile.orig	2004-10-18 
17:53:06.000000000 -0400
+++ linux-2.6.9/drivers/input/gameport/Makefile	2004-12-04 
16:51:12.000000000 -0500
@@ -5,7 +5,7 @@
  # Each configuration option enables a list of files.

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



    Note: the change is to a lower-case 'x' in
'CONFIG_GAMEPORT_CS461x'. It's hard to see.

    Kconfig in the same directory has


 >> config GAMEPORT_CS461x
 >> 	tristate "Crystal SoundFusion gameport support"
 >> 	depends on GAMEPORT


    This patch brings the Makefile into line with the spelling in
Kconfig.

Signed-off-by: Ron Murray <rjmx@rjmx.net>

  .....Ron

-- 
Ron Murray   (rjmx@rjmx.net)
http://www.rjmx.net/~ron
GPG Public Key Fingerprint: F2C1 FC47 5EF7 0317 133C  D66B 8ADA A3C4 
D86C 74DE

Re: [PATCH] CS461x gameport code isn't being included in build

[Cal Peake]

On Sat, 4 Dec 2004, Ron Murray wrote:

>    I've found a typo in drivers/input/gameport/Makefile in kernel
> 2.6.9 which effectively prevents the CS461x gameport code from
> being included. Here's the diff:

Good catch Ron (I thought I noticed that this wasn't being built), but 
your patch appears to have been whitespace damaged.

Vojtech, here's one that should apply cleanly.

thanks,

-- Cal

> Signed-off-by: Ron Murray <rjmx@rjmx.net>

Signed-off-by: Cal Peake <cp@absolutedigital.net>

--- linux-2.6.10-rc3/drivers/input/gameport/Makefile	2004-10-18 17:53:06.000000000 -0400
+++ linux-2.6.10-rc3-1/drivers/input/gameport/Makefile	2004-12-05 06:26:15.000000000 -0500
@@ -5,7 +5,7 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_GAMEPORT)		+= gameport.o
-obj-$(CONFIG_GAMEPORT_CS461X)	+= cs461x.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

Re: [PATCH] CS461x gameport code isn't being included in build

[Adrian Bunk]

On Sat, Dec 04, 2004 at 05:18:46PM -0500, Ron Murray wrote:
>    I've found a typo in drivers/input/gameport/Makefile in kernel
> 2.6.9 which effectively prevents the CS461x gameport code from
> being included. Here's the diff:
> 
> --- linux-2.6.9/drivers/input/gameport/Makefile.orig	2004-10-18 
> 17:53:06.000000000 -0400
> +++ linux-2.6.9/drivers/input/gameport/Makefile	2004-12-04 
> 16:51:12.000000000 -0500
> @@ -5,7 +5,7 @@
>  # Each configuration option enables a list of files.
> 
>  obj-$(CONFIG_GAMEPORT)		+= gameport.o
> -obj-$(CONFIG_GAMEPORT_CS461X)	+= cs461x.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
> 
>    Note: the change is to a lower-case 'x' in
> 'CONFIG_GAMEPORT_CS461x'. It's hard to see.
> 
>    Kconfig in the same directory has
> 
> >> config GAMEPORT_CS461x
> >> 	tristate "Crystal SoundFusion gameport support"
> >> 	depends on GAMEPORT
> 
>    This patch brings the Makefile into line with the spelling in
> Kconfig.
>...

Good catch.

But by convention, the names of config variables in the kernel are all 
uppercase.

I'm therefore suggesting the patch below fixing this bug the other way.

>  .....Ron


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.10-rc2-mm4-full/drivers/input/gameport/Kconfig.old	2004-12-08 13:45:53.000000000 +0100
+++ linux-2.6.10-rc2-mm4-full/drivers/input/gameport/Kconfig	2004-12-08 13:46:06.000000000 +0100
@@ -84,7 +84,7 @@
 	tristate "ForteMedia FM801 gameport support"
 	depends on GAMEPORT
 
-config GAMEPORT_CS461x
+config GAMEPORT_CS461X
 	tristate "Crystal SoundFusion gameport support"
 	depends on GAMEPORT
 

Re: [PATCH] CS461x gameport code isn't being included in build

[Alan Cox]

On Maw, 2005-01-04 at 04:14, Linus Torvalds applied:

> -obj-$(CONFIG_GAMEPORT_CS461X)	+= cs461x.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

This change makes the CS461x unique in having lower case in the config
name. In the previous discussion on the kernel list this patch was
rejected and instead the 461x was changed to 461X in the Kconfig file
keeping consistency with the rest of the kernel.

Alan