diff --git a/target/linux/at91-2.6/config/default b/target/linux/at91-2.6/config/default
index 5e05d5e41d..9633fb2cf1 100644
--- a/target/linux/at91-2.6/config/default
+++ b/target/linux/at91-2.6/config/default
@@ -42,7 +42,8 @@ CONFIG_ARM_THUMB=y
 # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
 CONFIG_AT91_SPI=y
 CONFIG_AT91_SPIDEV=y
-# CONFIG_ATM is not set
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_TCP is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BLK_DEV_LOOP is not set
@@ -52,7 +53,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BONDING is not set
-# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_BRIDGE_NETFILTER is not set
 # CONFIG_BSD_PROCESS_ACCT is not set
 # CONFIG_BT is not set
 # CONFIG_CIFS is not set
@@ -72,7 +73,6 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 CONFIG_CPU_TLB_V4WBI=y
-# CONFIG_CRC16 is not set
 CONFIG_CRC32=m
 # CONFIG_CRYPTO_AES is not set
 CONFIG_CRYPTO_ALGAPI=m
@@ -132,7 +132,6 @@ CONFIG_FPE_NWFPE=y
 CONFIG_FRAME_POINTER=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_GENERIC_TIME is not set
-# CONFIG_HAMRADIO is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_HFS_FS is not set
@@ -142,8 +141,7 @@ CONFIG_HZ=100
 # CONFIG_I2C is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_IKCONFIG is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_INOTIFY is not set
 CONFIG_INPUT=y
@@ -152,18 +150,22 @@ CONFIG_INPUT_MOUSEDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_IPV6 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_RAW is not set
+# CONFIG_IP6_NF_TARGET_HL is not set
+# CONFIG_IP6_NF_TARGET_LOG is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
 # CONFIG_IP_NF_MATCH_HASHLIMIT is not set
-# CONFIG_IP_NF_TARGET_IMQ is not set
-CONFIG_IP_NF_TARGET_LOG=y
+# CONFIG_IP_NF_TARGET_LOG is not set
 # CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_ROUTE is not set
 # CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_ROUTE_FWMARK is not set
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 # CONFIG_IP_ROUTE_VERBOSE is not set
 # CONFIG_ISO9660_FS is not set
@@ -227,23 +229,14 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
 # CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set
 # CONFIG_NETFILTER_XT_MATCH_DCCP is not set
-# CONFIG_NETFILTER_XT_MATCH_HELPER is not set
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
 # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
 # CONFIG_NETFILTER_XT_MATCH_REALM is not set
 # CONFIG_NETFILTER_XT_MATCH_SCTP is not set
-# CONFIG_NETFILTER_XT_MATCH_STATE is not set
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
-# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
 # CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NET_CLS_ACT is not set
 # CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPGRE_BROADCAST is not set
 # CONFIG_NET_PKTGEN is not set
@@ -260,6 +253,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 # CONFIG_PCCARD is not set
 CONFIG_PHYLIB=y
 # CONFIG_PM is not set
+# CONFIG_PPPOATM is not set
 # CONFIG_PPP_MULTILINK is not set
 # CONFIG_PPP_SYNC_TTY is not set
 # CONFIG_QSEMI_PHY is not set
@@ -302,7 +296,6 @@ CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_ZBOOT_ROM_BSS=0x0