Gameports and joysticks should not be available unless input core
support is selected first. Invalid configs were slipping through.
Index: 5.37/drivers/char/joystick/Config.in
--- 5.37/drivers/char/joystick/Config.in Wed, 06 Jun 2001 11:47:52 +1000 kaos (linux-2.4/Y/b/35_Config.in 1.1.1.3 644)
+++ 5.37(w)/drivers/char/joystick/Config.in Wed, 20 Jun 2001 00:06:14 +1000 kaos (linux-2.4/Y/b/35_Config.in 1.1.1.3 644)
@@ -5,15 +5,20 @@
mainmenu_option next_comment
comment 'Joysticks'
-tristate 'Game port support' CONFIG_INPUT_GAMEPORT
- dep_tristate ' Classic ISA/PnP gameports' CONFIG_INPUT_NS558 $CONFIG_INPUT_GAMEPORT
- dep_tristate ' PDPI Lightning 4 gamecard' CONFIG_INPUT_LIGHTNING $CONFIG_INPUT_GAMEPORT
- dep_tristate ' Aureal Vortex and Trident 4DWave gameports' CONFIG_INPUT_PCIGAME $CONFIG_INPUT_GAMEPORT
- dep_tristate ' Crystal SoundFusion gameports' CONFIG_INPUT_CS461X $CONFIG_INPUT_GAMEPORT
- dep_tristate ' SoundBlaster Live! gameports' CONFIG_INPUT_EMU10K1 $CONFIG_INPUT_GAMEPORT
-
-tristate 'Serial port device support' CONFIG_INPUT_SERIO
- dep_tristate ' Serial port input line discipline' CONFIG_INPUT_SERPORT $CONFIG_INPUT_SERIO
+if [ "$CONFIG_INPUT" != "n" ]; then
+ tristate 'Game port support' CONFIG_INPUT_GAMEPORT
+ dep_tristate ' Classic ISA/PnP gameports' CONFIG_INPUT_NS558 $CONFIG_INPUT_GAMEPORT
+ dep_tristate ' PDPI Lightning 4 gamecard' CONFIG_INPUT_LIGHTNING $CONFIG_INPUT_GAMEPORT
+ dep_tristate ' Aureal Vortex and Trident 4DWave gameports' CONFIG_INPUT_PCIGAME $CONFIG_INPUT_GAMEPORT
+ dep_tristate ' Crystal SoundFusion gameports' CONFIG_INPUT_CS461X $CONFIG_INPUT_GAMEPORT
+ dep_tristate ' SoundBlaster Live! gameports' CONFIG_INPUT_EMU10K1 $CONFIG_INPUT_GAMEPORT
+ tristate 'Serial port device support' CONFIG_INPUT_SERIO
+ dep_tristate ' Serial port input line discipline' CONFIG_INPUT_SERPORT $CONFIG_INPUT_SERIO
+else
+ # Must explicitly set to n for drivers/sound/Config.in
+ define_tristate CONFIG_INPUT_GAMEPORT n
+ comment 'Input core support is needed for gameports'
+fi
if [ "$CONFIG_INPUT" != "n" ]; then
comment 'Joysticks'
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/