aboutsummaryrefslogtreecommitdiffstats
path: root/debian/arch/amd64
diff options
context:
space:
mode:
authorJonas Smedegaard <js@debian.org>2005-12-29 12:10:27 +0000
committerJonas Smedegaard <js@debian.org>2005-12-29 12:10:27 +0000
commitf1e88562624296f2dbc75d257cb04197360e7224 (patch)
tree822b759fb910c742d8ab832c04f4e58a5e0d67f7 /debian/arch/amd64
parent37c05ad3f0f04b1d74794b8e714e8e6af2e4d1ce (diff)
downloadkernel_replicant_linux-f1e88562624296f2dbc75d257cb04197360e7224.tar.gz
kernel_replicant_linux-f1e88562624296f2dbc75d257cb04197360e7224.tar.bz2
kernel_replicant_linux-f1e88562624296f2dbc75d257cb04197360e7224.zip
Rollback phase 2 of kernel config option cleanup (needs more care).
svn path=/dists/trunk/linux-2.6/; revision=5126
Diffstat (limited to 'debian/arch/amd64')
-rw-r--r--debian/arch/amd64/config23
1 files changed, 23 insertions, 0 deletions
diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config
index a7c7e798891b..e74bbc3118dc 100644
--- a/debian/arch/amd64/config
+++ b/debian/arch/amd64/config
@@ -299,10 +299,12 @@ CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_IDEDMA_IVB is not set
CONFIG_IDEDMA_AUTO=y
# CONFIG_BLK_DEV_HD is not set
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_LEGACY=m
+CONFIG_SCSI_ATA_PIIX=m
CONFIG_SCSI_BUSLOGIC=m
# CONFIG_SCSI_OMIT_FLASHPOINT is not set
CONFIG_SCSI_DMX3191D=m
@@ -363,6 +365,27 @@ CONFIG_I2O_CONFIG=m
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_IP_TCPDIAG=m
+CONFIG_IP_TCPDIAG_IPV6=y
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
CONFIG_ATM=y
CONFIG_ATM_CLIP=y
# CONFIG_ATM_CLIP_NO_ICMP is not set