Home Home > GIT Browse
summaryrefslogtreecommitdiff
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-02-05 10:36:47 (GMT)
committer Linus Torvalds <torvalds@penguin.transmeta.com>2002-02-05 10:36:47 (GMT)
commit040fdeaf4cd38a0c0154eef22e085d0efd2f3219 (patch) (side-by-side diff)
treeccbfffa95612999f39e1bd2da3d5f2a0fff23b8e
parent1e5acec0ed3d402ae1b22c4dc73b889c549313cc (diff)
defconfig:v2.5.4-pre1
update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--arch/i386/defconfig27
1 files changed, 12 insertions, 15 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 48a29fe..4f292da 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -401,13 +401,12 @@ CONFIG_DUMMY=m
#
CONFIG_NET_ETHERNET=y
# CONFIG_SUNLANCE is not set
# 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
# CONFIG_NET_VENDOR_SMC is not set
# CONFIG_NET_VENDOR_RACAL is not set
# CONFIG_AT1700 is not set
@@ -515,19 +514,29 @@ CONFIG_PCMCIA_RAYCS=y
#
# Old CD-ROM drivers (not SCSI, not IDE)
#
# 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
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
@@ -548,25 +557,12 @@ CONFIG_UNIX98_PTY_COUNT=256
#
# CONFIG_BUSMOUSE is not set
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
#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
@@ -718,12 +714,13 @@ CONFIG_SOUND_ES1371=y
# CONFIG_SOUND_MSNDCLAS is not set
# CONFIG_SOUND_MSNDPIN is not set
# CONFIG_SOUND_VIA82CXXX is not set
# CONFIG_MIDI_VIA82CXXX is not set
# CONFIG_SOUND_OSS is not set
# CONFIG_SOUND_TVMIXER is not set
+CONFIG_INPUT_GAMEPORT=y
#
# USB support
#
CONFIG_USB=y
# CONFIG_USB_DEBUG is not set