Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-02-24 19:46:14 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-02-24 19:46:14 -0800
commitdbd56307a5fbd69fbb0b59b16b8963bca9e07c09 (patch)
tree9c5a091b8c9b191be530b6d7d6629338b56b1430
parent5c58f77a86c1fe54c532792ca8be5e24a208c13c (diff)
Update kernel version and defconfig
-rw-r--r--Makefile4
-rw-r--r--arch/i386/defconfig13
2 files changed, 15 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f6fb0768c51e..1ca1a85d07eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 5
-EXTRAVERSION =
+SUBLEVEL = 6
+EXTRAVERSION =-pre1
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 876e6e7bdd90..68e11e22f8d4 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -454,6 +454,7 @@ CONFIG_EEPRO100=y
#
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
# CONFIG_MYRI_SBUS is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
@@ -718,11 +719,19 @@ CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y
CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
+
+#
+# ISA devices
+#
# CONFIG_SND_AD1816A is not set
# CONFIG_SND_AD1848 is not set
# CONFIG_SND_CS4231 is not set
@@ -749,6 +758,10 @@ CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SND_DT0197H is not set
# CONFIG_SND_OPL3SA2 is not set
# CONFIG_SND_SGALAXY is not set
+
+#
+# PCI devices
+#
# CONFIG_SND_ALI5451 is not set
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_EMU10K1 is not set