aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm-2.4
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-06-13 18:50:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-06-13 18:50:51 +0000
commit027b61b79061eaf620f3858ce12f89d79adbb0de (patch)
tree8bc95b72dd11c4631dd9faa82148e00bfdaee6b4 /target/linux/brcm-2.4
parent357dc0efd79f96a32923f158088ee0e760fe666c (diff)
downloadupstream-027b61b79061eaf620f3858ce12f89d79adbb0de.tar.gz
upstream-027b61b79061eaf620f3858ce12f89d79adbb0de.tar.bz2
upstream-027b61b79061eaf620f3858ce12f89d79adbb0de.zip
Resync brcm-2.4 kernel config and enable syncookies (#1876)
SVN-Revision: 7622
Diffstat (limited to 'target/linux/brcm-2.4')
-rw-r--r--target/linux/brcm-2.4/config/default4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm-2.4/config/default b/target/linux/brcm-2.4/config/default
index 9039acf82d..504acb66d4 100644
--- a/target/linux/brcm-2.4/config/default
+++ b/target/linux/brcm-2.4/config/default
@@ -145,6 +145,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
# CONFIG_IDE_CHIPSETS is not set
# CONFIG_IDE_TASK_IOCTL is not set
# CONFIG_IEEE1394 is not set
+CONFIG_IP6_NF_MATCH_LIMIT=m
CONFIG_IP_VS=m
# CONFIG_IP_VS_DEBUG is not set
CONFIG_IP_VS_DH=m
@@ -184,6 +185,7 @@ CONFIG_NET_PCI=y
CONFIG_NET_WIRELESS=y
CONFIG_NEW_IRQ=y
CONFIG_NEW_TIME_C=y
+CONFIG_NLS=y
CONFIG_PARPORT=m
# CONFIG_PARPORT_1284 is not set
# CONFIG_PARPORT_AMIGA is not set
@@ -195,8 +197,6 @@ CONFIG_PARPORT=m
# CONFIG_PARPORT_PC is not set
CONFIG_PARPORT_SPLINK=m
# CONFIG_PARPORT_SUNBPP is not set
-CONFIG_PCCARD=m
-CONFIG_PCCARD_NONSTATIC=m
CONFIG_PCI=y
CONFIG_PCI_AUTO=y
# CONFIG_PCI_HERMES is not set