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 6ab9a66..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
@@ -77,7 +78,9 @@ CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA is not set
 # 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
@@ -122,6 +125,7 @@ CONFIG_ATM_CLIP_NO_ICMP=y
 # CONFIG_B44 is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
+CONFIG_BASE_SMALL=0
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_BATTERY_BQ27000_HDQ is not set
 # CONFIG_BATTERY_BQ27x00 is not set
@@ -318,6 +322,7 @@ CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_FREQ is not set
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_CRASH_DUMP is not set
@@ -400,6 +405,7 @@ CONFIG_CRYPTO_ZLIB=y
 # CONFIG_DAB is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCB is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
@@ -445,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
@@ -541,8 +548,8 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
-# CONFIG_FCOE is not set
 # CONFIG_FCOE_FNIC is not set
+# CONFIG_FCOE is not set
 # CONFIG_FDDI is not set
 # CONFIG_FEALNX is not set
 CONFIG_FIB_RULES=y
@@ -560,6 +567,7 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_FTL is not set
 # CONFIG_FTRACE is not set
+# CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_FUSE_FS is not set
 # CONFIG_FUSION_FC is not set
@@ -592,6 +600,7 @@ CONFIG_GENERIC_TIME=y
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_HAVE_AOUT is not set
+# CONFIG_HCALL_STATS is not set
 # CONFIG_HDLC_CISCO is not set
 # CONFIG_HDLC_FR is not set
 # CONFIG_HDLC is not set
@@ -650,10 +659,10 @@ CONFIG_HOTPLUG=y
 # CONFIG_HVC_UDBG is not set
 # CONFIG_HWMON is not set
 # CONFIG_HWMON_VID is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
-# CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_GEODE is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_VIA is not set
 CONFIG_HZ=100
 # CONFIG_HZ_1000 is not set
@@ -684,6 +693,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_I810 is not set
 # CONFIG_I2C_IBM_IIC is not set
 # CONFIG_I2C_ISCH is not set
+# CONFIG_I2C is not set
 # CONFIG_I2C_MPC is not set
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_OCORES is not set
@@ -952,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
@@ -997,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
@@ -1007,10 +1013,10 @@ CONFIG_KMOD=y
 # CONFIG_LASAT is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_LBD is not set
-# CONFIG_LDM_PARTITION is not set
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LDM_PARTITION is not set
 # CONFIG_LEDS_ALIX is not set
 # CONFIG_LEDS_BD2802 is not set
 CONFIG_LEDS_CLASS=y
@@ -1057,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
@@ -1086,6 +1093,7 @@ CONFIG_MII=y
 CONFIG_MINI_FO=y
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPS_FPU_EMU is not set
 CONFIG_MISC_DEVICES=y
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MISDN_HFCPCI is not set
@@ -1205,6 +1213,7 @@ CONFIG_MTD=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_NAMESPACES is not set
 # CONFIG_NATIONAL_PHY is not set
+# CONFIG_NATSEMI is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NEC_MARKEINS is not set
@@ -1234,6 +1243,7 @@ CONFIG_NET_CLS=y
 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
@@ -1452,6 +1462,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
+# CONFIG_NVRAM is not set
 # CONFIG_OCF_BENCH is not set
 # CONFIG_OCF_EP80579 is not set
 # CONFIG_OCF_HIFNHIPP is not set
@@ -1527,16 +1538,18 @@ 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
 # CONFIG_PCI_IOV is not set
-# CONFIG_PCI is not set
 # CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_STUB is not set
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCI=y
 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_DEBUG is not set
@@ -1554,6 +1567,7 @@ CONFIG_PCI_QUIRKS=y
 # CONFIG_PCMCIA_WAVELAN is not set
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_PCNET32 is not set
+# CONFIG_PCSPKR_PLATFORM is not set
 # CONFIG_PD6729 is not set
 # CONFIG_PDC_ADMA is not set
 # CONFIG_PHANTOM is not set
@@ -1694,6 +1708,9 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
 # CONFIG_RTL8306_PHY 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
@@ -1832,8 +1849,8 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_I5K_AMB is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_K8TEMP is not set
-# CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3LV02D is not set
+# CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM70 is not set
 # CONFIG_SENSORS_LM75 is not set
@@ -1914,6 +1931,7 @@ CONFIG_SLAB=y
 # CONFIG_SMB_NLS_DEFAULT is not set
 # CONFIG_SMC911X is not set
 # CONFIG_SMC91X is not set
+# CONFIG_SMP is not set
 # CONFIG_SMSC911X is not set
 # CONFIG_SMSC9420 is not set
 # CONFIG_SMSC_PHY is not set
@@ -2134,6 +2152,7 @@ CONFIG_TEXTSEARCH=y
 # CONFIG_THERMAL_HWMON is not set
 # CONFIG_THERMAL is not set
 # CONFIG_THRUSTMASTER_FF is not set
+CONFIG_TICK_ONESHOT=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
 CONFIG_TIMERFD=y
@@ -2527,6 +2546,7 @@ CONFIG_VLAN_8021Q=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS 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