update version and defconfig

ce4d9bee · Linus Torvalds · Linus Torvalds · dd696ac1 · ce4d9bee · ce4d9bee
Commit ce4d9bee authored Apr 02, 2002 by Linus Torvalds Committed by Linus Torvalds Apr 02, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

Makefile Makefile +2 -2

arch/i386/defconfig arch/i386/defconfig +0 -3

No files found.
--- a/Makefile
+++ b/Makefile
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 7
+SUBLEVEL = 8
-EXTRAVERSION =
+EXTRAVERSION =-pre1
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -268,7 +268,6 @@ CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_WDC_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
-# CONFIG_AMD74XX_OVERRIDE is not set
 # CONFIG_BLK_DEV_CMD64X is not set
 # CONFIG_BLK_DEV_CY82C693 is not set
 # CONFIG_BLK_DEV_CS5530 is not set
@@ -276,7 +275,6 @@ CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_HPT34X_AUTODMA is not set
 # CONFIG_BLK_DEV_HPT366 is not set
 CONFIG_BLK_DEV_PIIX=y
-CONFIG_PIIX_TUNING=y
 # CONFIG_BLK_DEV_NS87415 is not set
 # CONFIG_BLK_DEV_OPTI621 is not set
 # CONFIG_BLK_DEV_PDC_ADMA is not set
@@ -291,7 +289,6 @@ CONFIG_PIIX_TUNING=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
 # CONFIG_BLK_DEV_ATARAID is not set
 # CONFIG_BLK_DEV_ATARAID_PDC is not set
 # CONFIG_BLK_DEV_ATARAID_HPT is not set