From 0ae47fceb3f7515fac5bb969820dba0ad38d1984 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sun, 21 Mar 2004 01:58:59 +0000
Subject: Update kernel to 2.4.26-pre5

---
 sources/linux.config | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'sources/linux.config')

diff --git a/sources/linux.config b/sources/linux.config
index ee96b34d8..e33656a9f 100644
--- a/sources/linux.config
+++ b/sources/linux.config
@@ -107,6 +107,7 @@ CONFIG_KCORE_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
+# CONFIG_OOM_KILLER is not set
 CONFIG_PM=y
 CONFIG_APM=y
 # CONFIG_APM_IGNORE_USER_SUSPEND is not set
@@ -195,7 +196,6 @@ CONFIG_IP_ROUTE_TOS=y
 # CONFIG_ARPD is not set
 CONFIG_INET_ECN=y
 # CONFIG_SYN_COOKIES is not set
-CONFIG_IP_NMAP_FREAK_PATCH=y
 
 #
 #   IP: Netfilter Configuration
@@ -261,6 +261,9 @@ CONFIG_IP_NF_ARP_MANGLE=y
 #
 CONFIG_IPV6_SCTP__=y
 # CONFIG_IP_SCTP is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+CONFIG_SCTP_HMAC_SHA1=y
+# CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
 
@@ -292,6 +295,7 @@ CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_CBQ=y
 CONFIG_NET_SCH_HTB=y
 CONFIG_NET_SCH_CSZ=y
+CONFIG_NET_SCH_HFSC=y
 CONFIG_NET_SCH_PRIO=y
 CONFIG_NET_SCH_RED=y
 CONFIG_NET_SCH_SFQ=y
@@ -396,10 +400,10 @@ CONFIG_IDEDMA_PCI_WIP=y
 CONFIG_IDEDMA_AUTO=y
 # CONFIG_IDEDMA_IVB is not set
 # 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
+# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
 # CONFIG_BLK_DEV_ATARAID_SII is not set
 
 #
@@ -485,6 +489,7 @@ CONFIG_NET_PCI=y
 # CONFIG_FEALNX is not set
 CONFIG_NATSEMI=y
 # CONFIG_NE2K_PCI is not set
+# CONFIG_FORCEDETH is not set
 # CONFIG_NE3210 is not set
 # CONFIG_ES3210 is not set
 # CONFIG_8139CP is not set
@@ -547,6 +552,7 @@ CONFIG_HOSTAP=m
 CONFIG_PCMCIA_HERMES=m
 CONFIG_HOSTAP_CS=m
 # CONFIG_AIRO_CS is not set
+# CONFIG_PCMCIA_ATMEL is not set
 CONFIG_NET_WIRELESS=y
 
 #
@@ -595,6 +601,7 @@ CONFIG_NET_WIRELESS=y
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_UINPUT is not set
 
 #
 # Character devices
@@ -642,6 +649,7 @@ CONFIG_UNIX98_PTY_COUNT=256
 # Watchdog Cards
 #
 # CONFIG_WATCHDOG is not set
+# CONFIG_SCx200 is not set
 # CONFIG_SCx200_GPIO is not set
 CONFIG_AMD_RNG=y
 # CONFIG_INTEL_RNG is not set
@@ -671,6 +679,7 @@ CONFIG_RTC=y
 # CONFIG_PCMCIA_SERIAL_CS is not set
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_MWAVE is not set
+# CONFIG_OBMOUSE is not set
 
 #
 # Multimedia devices
@@ -733,6 +742,11 @@ CONFIG_DEVPTS_FS=y
 # CONFIG_UDF_RW is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_UFS_FS_WRITE is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_TRACE is not set
+# CONFIG_XFS_DEBUG is not set
 
 #
 # Network File Systems
-- 
cgit v1.2.3