aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/linux-2.6/config/brcm
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2005-12-23 23:56:30 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2005-12-23 23:56:30 +0000
commitbc9ca6a88301a965fd246b0269ecafff011db745 (patch)
tree5f0a8ee8d1f13fb5f37b58bee050c100006a227f /target/linux/linux-2.6/config/brcm
parent5dbedb926a0233f4abeeb97b49008608d948eabe (diff)
downloadupstream-bc9ca6a88301a965fd246b0269ecafff011db745.tar.gz
upstream-bc9ca6a88301a965fd246b0269ecafff011db745.tar.bz2
upstream-bc9ca6a88301a965fd246b0269ecafff011db745.zip
add pfring patch to 2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2755 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/linux-2.6/config/brcm')
-rw-r--r--target/linux/linux-2.6/config/brcm7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/linux-2.6/config/brcm b/target/linux/linux-2.6/config/brcm
index af99c279f6..e7ec865e58 100644
--- a/target/linux/linux-2.6/config/brcm
+++ b/target/linux/linux-2.6/config/brcm
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.15-rc5
-# Thu Dec 15 08:44:06 2005
+# Linux kernel version: 2.6.15-rc6
+# Sat Dec 24 00:37:33 2005
#
CONFIG_MIPS=y
@@ -155,6 +155,7 @@ CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
# CONFIG_IKCONFIG is not set
CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
# CONFIG_KALLSYMS is not set
CONFIG_PRINTK=y
@@ -162,7 +163,6 @@ CONFIG_BUG=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SHMEM=y
CONFIG_CC_ALIGN_FUNCTIONS=0
CONFIG_CC_ALIGN_LABELS=0
@@ -252,6 +252,7 @@ CONFIG_UNIX=y
CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set
# CONFIG_NET_KEY is not set
+CONFIG_RING=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y