upgrade to 2.6.17, probably break some stuff temporary

[openwrt.git] / target / linux / aruba-2.6 / config

diff --git a/target/linux/aruba-2.6/config b/target/linux/aruba-2.6/config
index d7e4e53..d49ea05 100644 (file)
--- a/target/linux/aruba-2.6/config
+++ b/target/linux/aruba-2.6/config
@@ -169,10 +169,10 @@ CONFIG_CC_ALIGN_FUNCTIONS=0
 CONFIG_CC_ALIGN_LABELS=0
 CONFIG_CC_ALIGN_LOOPS=0
 CONFIG_CC_ALIGN_JUMPS=0
-# CONFIG_SLAB is not set
+CONFIG_SLAB=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
-CONFIG_SLOB=y
+# CONFIG_SLOB is not set
 CONFIG_OBSOLETE_INTERMODULE=y
 
 #
@@ -312,7 +312,8 @@ CONFIG_IP_NF_IRC=m
 # CONFIG_IP_NF_NETBIOS_NS is not set
 CONFIG_IP_NF_TFTP=m
 CONFIG_IP_NF_AMANDA=m
-# CONFIG_IP_NF_PPTP is not set
+CONFIG_IP_NF_PPTP=m
+CONFIG_IP_NF_SIP=m
 CONFIG_IP_NF_QUEUE=y
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -347,6 +348,8 @@ CONFIG_IP_NF_NAT_IRC=m
 CONFIG_IP_NF_NAT_FTP=y
 CONFIG_IP_NF_NAT_TFTP=m
 CONFIG_IP_NF_NAT_AMANDA=m
+CONFIG_IP_NF_NAT_PPTP=m
+CONFIG_IP_NF_NAT_SIP=m
 CONFIG_IP_NF_MANGLE=y
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_ECN=m