adm5120: sync kernel configs

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

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index db44fd7..3cde1df 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -13,6 +13,7 @@
 # CONFIG_AFFS_FS is not set
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AFS_FS is not set
+# CONFIG_AGP is not set
 CONFIG_AIO=y
 # CONFIG_AIRO_CS is not set
 # CONFIG_AIRO is not set
@@ -79,6 +80,7 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATALK is not set
 # CONFIG_ATA_NONSTANDARD is not set
 # CONFIG_ATA_OVER_ETH is not set
+# CONFIG_ATA_PIIX is not set
 # CONFIG_ATARI_PARTITION is not set
 CONFIG_ATA_SFF=y
 # CONFIG_ATH5K is not set
@@ -449,6 +451,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_E1000 is not set
 # CONFIG_E100 is not set
 # CONFIG_ECONET is not set
+# CONFIG_EDAC is not set
 # CONFIG_EEPRO100 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_EEPROM_AT24 is not set
@@ -959,14 +962,7 @@ CONFIG_IPW2200_MONITOR=y
 # CONFIG_IRDA is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN_CAPI_CAPI20 is not set
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-# CONFIG_ISDN_CAPI_CAPIFS is not set
-# CONFIG_ISDN_CAPI is not set
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-# CONFIG_ISDN_I4L is not set
-CONFIG_ISDN=y
+# CONFIG_ISDN is not set
 # CONFIG_ISL29003 is not set
 # CONFIG_ISO9660_FS is not set
 # CONFIG_IWL3945 is not set
@@ -1004,6 +1000,9 @@ CONFIG_JOLIET=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_KALLSYMS is not set
 # CONFIG_KARMA_PARTITION is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_GZIP is not set
+CONFIG_KERNEL_LZMA=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
 # CONFIG_KMEMTRACE is not set
@@ -1064,6 +1063,7 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LXT_PHY is not set
 # CONFIG_MAC80211 is not set
 # CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_MAGIC_SYSRQ is not set
@@ -1237,13 +1237,13 @@ CONFIG_NET_CLS_IND=y
 # CONFIG_NET_CLS_TCINDEX is not set
 # CONFIG_NET_CLS_U32 is not set
 CONFIG_NET_CLS=y
-# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETDEBUG is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_NETDEV_1000=y
 CONFIG_NETDEVICES_MULTIQUEUE=y
 CONFIG_NETDEVICES=y
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_NET_EMATCH_CMP is not set
 # CONFIG_NET_EMATCH is not set
@@ -1538,6 +1538,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PCF8575 is not set
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCI_ATMEL is not set
+# CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set
 # CONFIG_PCIEASPM is not set
 # CONFIG_PCI_HERMES is not set
@@ -1707,9 +1708,9 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
 # CONFIG_RTL8306_PHY is not set
-# CONFIG_RTL8366S_PHY is not set
-# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
 # CONFIG_RTL8366_SMI is not set
+# CONFIG_RTL8366S_PHY_DEBUG_FS is not set
+# CONFIG_RTL8366S_PHY is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_S2IO is not set
@@ -2545,8 +2546,8 @@ CONFIG_VLAN_8021Q=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS is not set
-# CONFIG_W1 is not set
 # CONFIG_W1_CON is not set
+# CONFIG_W1 is not set
 # CONFIG_W1_MASTER_DS1WM is not set
 # CONFIG_W1_MASTER_DS2482 is not set
 # CONFIG_W1_MASTER_DS2490 is not set