CS461x gameport code isn't being included in build

PATCH In review Ron Murray 3 participants 3 messages Dec 4, 2004 – Dec 8, 2004 Input drivers

Share & tools

Ron Murray

author

2004-12-04 22:18 UTC #0 lore raw

PATCH 1/1 CS461x gameport code isn't being included in build

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:

drivers/input/gameport/Makefile renamed from drivers/input/gameport/Makefile.orig +1 -1

@@ -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

Quoted 3 lines

Quoted 3 lines
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 <[email protected]>

.....Ron

Signature · 3 lines

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

Cal Peake

2004-12-05 12:53 UTC #1 lore raw

Quoted 3 lines · 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:

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

Quoted 1 line

Signed-off-by Ron Murray <[email protected]>

Signed-off-by Cal Peake <[email protected]>

drivers/input/gameport/Makefile +1 -1

@@ -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

Adrian Bunk

2004-12-08 12:51 UTC #2 lore raw

In reply to Ron Murray

Quoted 23 lines · 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
(quoted diff) +1 -1
@@ -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

Quoted 7 lines

Quoted 3 lines
Quoted 3 lines
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.

Quoted 1 line

.....Ron

Signed-off-by Adrian Bunk <[email protected]>

drivers/input/gameport/Kconfig renamed from drivers/input/gameport/Kconfig.old +1 -1

@@ -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