diff options
author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-02-05 02:36:47 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-02-05 02:36:47 -0800 |
commit | 040fdeaf4cd38a0c0154eef22e085d0efd2f3219 (patch) | |
tree | ccbfffa95612999f39e1bd2da3d5f2a0fff23b8e | |
parent | 1e5acec0ed3d402ae1b22c4dc73b889c549313cc (diff) | |
download | history-040fdeaf4cd38a0c0154eef22e085d0efd2f3219.tar.gz |
defconfig:v2.5.4-pre1
update
-rw-r--r-- | arch/i386/defconfig | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 48a29fe45a467..4f292da94e8df 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -404,7 +404,6 @@ CONFIG_NET_ETHERNET=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNBMAC is not set # CONFIG_SUNQE is not set -# CONFIG_SUNLANCE is not set # CONFIG_SUNGEM is not set # CONFIG_NET_VENDOR_3COM is not set # CONFIG_LANCE is not set @@ -518,13 +517,23 @@ CONFIG_PCMCIA_RAYCS=y # CONFIG_CD_NO_IDESCSI is not set # -# Input core support +# Input device support # # CONFIG_INPUT is not set # CONFIG_INPUT_KEYBDEV is not set # CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_EVDEV is not set +# CONFIG_GAMEPORT is not set +CONFIG_SOUND_GAMEPORT=y +# CONFIG_GAMEPORT_NS558 is not set +# CONFIG_GAMEPORT_L4 is not set +# CONFIG_INPUT_EMU10K1 is not set +# CONFIG_GAMEPORT_PCIGAME is not set +# CONFIG_GAMEPORT_FM801 is not set +# CONFIG_GAMEPORT_CS461x is not set +# CONFIG_SERIO is not set +# CONFIG_SERIO_SERPORT is not set # # Character devices @@ -551,19 +560,6 @@ CONFIG_MOUSE=y CONFIG_PSMOUSE=y # CONFIG_82C710_MOUSE is not set # CONFIG_PC110_PAD is not set - -# -# Joysticks -# -# CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# # CONFIG_QIC02_TAPE is not set # @@ -721,6 +717,7 @@ CONFIG_SOUND_ES1371=y # CONFIG_MIDI_VIA82CXXX is not set # CONFIG_SOUND_OSS is not set # CONFIG_SOUND_TVMIXER is not set +CONFIG_INPUT_GAMEPORT=y # # USB support |