fix breakage introduced with [17394]

[openwrt.git] / target / linux / generic-2.6 / config-2.6.28

diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index 755b67d..7311916 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -268,7 +268,7 @@ CONFIG_CARDBUS=y
 # CONFIG_CASSINI is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_CDROM_PKTCDVD is not set
-CONFIG_CFG80211=m
+# CONFIG_CFG80211 is not set
 # CONFIG_CGROUPS is not set
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
@@ -290,7 +290,7 @@ CONFIG_CLS_U32_PERF=y
 CONFIG_CMDLINE=""
 # CONFIG_CODA_FS is not set
 # CONFIG_COMPAT_BRK is not set
-CONFIG_CONFIGFS_FS=y
+# CONFIG_CONFIGFS_FS is not set
 # CONFIG_CONNECTOR is not set
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -304,23 +304,22 @@ CONFIG_CRC32=y
 # CONFIG_CRC_ITU_T is not set
 # CONFIG_CRC_T10DIF is not set
 CONFIG_CROSSCOMPILE=y
-CONFIG_CRYPTO_AEAD2=m
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_ALGAPI2=m
-CONFIG_CRYPTO_ALGAPI=m
+# CONFIG_CRYPTO_AEAD is not set
+# CONFIG_CRYPTO_AES_586 is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ALGAPI is not set
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_AUTHENC is not set
-CONFIG_CRYPTO_BLKCIPHER2=m
-CONFIG_CRYPTO_BLKCIPHER=m
+# CONFIG_CRYPTO_BLKCIPHER is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_CBC is not set
 # CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRC32C_INTEL is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRYPTD is not set
 # CONFIG_CRYPTO_CTR is not set
@@ -328,20 +327,19 @@ CONFIG_CRYPTO_BLKCIPHER=m
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
-CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_FIPS is not set
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_HASH2=m
-CONFIG_CRYPTO_HASH=m
+# CONFIG_CRYPTO_HASH is not set
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_HW is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_LZO is not set
-CONFIG_CRYPTO_MANAGER2=m
-CONFIG_CRYPTO_MANAGER=m
+# CONFIG_CRYPTO_MANAGER2 is not set
+# CONFIG_CRYPTO_MANAGER is not set
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MD5 is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -352,8 +350,8 @@ CONFIG_CRYPTO_MANAGER=m
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_RNG2=m
-CONFIG_CRYPTO_RNG=m
+# CONFIG_CRYPTO_RNG is not set
+# CONFIG_CRYPTO_SALSA20_586 is not set
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -364,6 +362,7 @@ CONFIG_CRYPTO_RNG=m
 # CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH_586 is not set
 # CONFIG_CRYPTO_TWOFISH_COMMON is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_WP512 is not set
@@ -385,9 +384,9 @@ CONFIG_DEFAULT_DEADLINE=y
 CONFIG_DEFAULT_IOSCHED="deadline"
 # CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="vegas"
-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set
+CONFIG_DEFAULT_TCP_CONG="westwood"
+# CONFIG_DEFAULT_VEGAS is not set
+CONFIG_DEFAULT_WESTWOOD=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DEVKMEM is not set
 # CONFIG_DGRS is not set
@@ -454,6 +453,7 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
 CONFIG_FRAME_WARN=1024
+# CONFIG_FREEZER is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
@@ -486,6 +486,7 @@ CONFIG_GENERIC_TIME=y
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_HDLC_CISCO is not set
 # CONFIG_HDLC_FR is not set
 # CONFIG_HDLC is not set
@@ -524,8 +525,6 @@ CONFIG_HAMRADIO=y
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
 # CONFIG_HOSTAP_CS is not set
-# CONFIG_HOSTAP_FIRMWARE is not set
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_HOSTAP_PCI is not set
 # CONFIG_HOSTAP_PLX is not set
@@ -592,6 +591,9 @@ CONFIG_HZ_100=y
 # CONFIG_I82092 is not set
 # CONFIG_I82365 is not set
 # CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -713,7 +715,7 @@ CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IPMI_HANDLER is not set
-# CONFIG_IP_MROUTE is not set
+CONFIG_IP_MROUTE=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_AMANDA is not set
@@ -783,6 +785,8 @@ CONFIG_IP_NF_SET_MAX=256
 # CONFIG_IP_NF_TARGET_TTL is not set
 # CONFIG_IP_NF_TARGET_ULOG is not set
 # CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_PIMSM_V1 is not set
+# CONFIG_IP_PIMSM_V2 is not set
 # CONFIG_IP_PNP is not set
 CONFIG_IP_ROUTE_FWMARK=y
 CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
@@ -865,7 +869,7 @@ CONFIG_JOLIET=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
-# CONFIG_KMOD is not set
+CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
 # CONFIG_LANMEDIA is not set
 # CONFIG_LAPB is not set
@@ -902,20 +906,9 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LSF is not set
 # CONFIG_LXT_PHY is not set
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-# CONFIG_MAC80211_HWSIM is not set
-# CONFIG_MAC80211_LEDS is not set
-CONFIG_MAC80211=m
-# CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set
-CONFIG_MAC80211_RC_DEFAULT="pid"
-CONFIG_MAC80211_RC_DEFAULT_PID=y
-# CONFIG_MAC80211_RC_MINSTREL is not set
-CONFIG_MAC80211_RC_PID=y
+# CONFIG_MAC80211 is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
-CONFIG_MAC_PARTITION=y
+# CONFIG_MAC_PARTITION is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_MARKEINS is not set
@@ -1049,17 +1042,15 @@ CONFIG_MTD=y
 # CONFIG_NET_ACT_MIRRED is not set
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set
-CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_POLICE is not set
 # CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_BASIC=y
 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FW is not set
 CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
 # CONFIG_NET_CLS_ROUTE4 is not set
-CONFIG_NET_CLS_ROUTE=y
 # CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_TCINDEX is not set
@@ -1206,6 +1197,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CT_PROTO_GRE is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
+# CONFIG_NF_DEFRAG_IPV4 is not set
 # CONFIG_NF_NAT_AMANDA is not set
 # CONFIG_NF_NAT_FTP is not set
 # CONFIG_NF_NAT_H323 is not set
@@ -1295,6 +1287,10 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_P54_COMMON is not set
 CONFIG_PACKET_MMAP=y
 CONFIG_PACKET=y
+# CONFIG_PAGE_SIZE_16KB is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PANTHERLORD_FF is not set
 # CONFIG_PARPORT is not set
 # CONFIG_PARPORT_PC is not set
@@ -1336,6 +1332,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
@@ -1350,6 +1347,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI is not set
+# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
 # CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCIPCWATCHDOG is not set
@@ -1377,6 +1375,7 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
 # CONFIG_PHYLIB is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PID_NS is not set
 CONFIG_PLIST=y
 # CONFIG_PLX_HERMES is not set
@@ -1498,6 +1497,7 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
+# CONFIG_RTL8306_PHY is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
@@ -1840,6 +1840,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 # CONFIG_SPI_AT25 is not set
 # CONFIG_SPI_DEBUG is not set
+# CONFIG_SPI_GPIO_OLD is not set
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_TLE62X0 is not set
@@ -1848,6 +1849,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_SQUASHFS_VMALLOC is not set
 CONFIG_SQUASHFS=y
+# CONFIG_SSB_BLOCKIO is not set
 # CONFIG_SSB_DEBUG is not set
 # CONFIG_SSB is not set
 # CONFIG_SSB_PCMCIAHOST is not set
@@ -1894,9 +1896,9 @@ CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_ILLINOIS is not set
 # CONFIG_TCP_CONG_LP is not set
 # CONFIG_TCP_CONG_SCALABLE is not set
-CONFIG_TCP_CONG_VEGAS=y
+# CONFIG_TCP_CONG_VEGAS is not set
 # CONFIG_TCP_CONG_VENO is not set
-# CONFIG_TCP_CONG_WESTWOOD is not set
+CONFIG_TCP_CONG_WESTWOOD=y
 # CONFIG_TCP_CONG_YEAH is not set
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_TEXTSEARCH_BM is not set