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 f668315..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
@@ -304,18 +304,15 @@ 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_AEAD is not set
 # CONFIG_CRYPTO_AES_586 is not set
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_ALGAPI2=m
-CONFIG_CRYPTO_ALGAPI=m
+# 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
@@ -330,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
@@ -354,8 +350,7 @@ 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
@@ -530,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
@@ -722,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
@@ -792,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
@@ -911,18 +906,7 @@ 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 is not set
 # CONFIG_MACVLAN is not set
@@ -1058,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
@@ -1350,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
@@ -1364,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
@@ -1513,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