[backfire] merge r23293

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

diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32
index 615430f53830774ccc230ad545c9fe6215688a1f..05d3a6bf7cc57dbe9248e09e70bda333e2e21a83 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.32
+++ b/target/linux/generic-2.6/config-2.6.32
@@ -5,6 +5,7 @@
 # CONFIG_AB3100_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACENIC is not set
+# CONFIG_ACPI_POWER_METER is not set
 # CONFIG_ACORN_PARTITION is not set
 # CONFIG_ADAPTEC_STARFIRE is not set
 # CONFIG_ADFS_FS is not set
@@ -344,11 +345,13 @@ CONFIG_COMPAT_NET_DEV_OPS=y
 # CONFIG_CONNECTOR is not set
 CONFIG_CONSTRUCTORS=y
 # CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS 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_CRASHLOG=y
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRC16 is not set
 CONFIG_CRC32=y
@@ -381,6 +384,7 @@ CONFIG_CRYPTO_ALGAPI=y
 # CONFIG_CRYPTO_DEFLATE is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_MV_CESA is not set
 # CONFIG_CRYPTO_ECB is not set
 # CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_FIPS is not set
@@ -438,13 +442,16 @@ CONFIG_CRYPTO_ZLIB=y
 # CONFIG_DEBUG_CREDENTIALS is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_ERRORS is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_KERNEL is not set
+# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_LL is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
@@ -488,10 +495,12 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_DL2K is not set
 # CONFIG_DLM is not set
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_DMA_ENGINE is not set
 # CONFIG_DMASCC is not set
 # CONFIG_DMATEST is not set
+# CONFIG_DM_LOG_USERSPACE is not set
 # CONFIG_DNET is not set
 # CONFIG_DNOTIFY is not set
 # CONFIG_DRAGONRISE_FF is not set
@@ -542,6 +551,7 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_EXT4_DEBUG is not set
 # CONFIG_EXT4DEV_FS is not set
 # CONFIG_EXT4_FS is not set
+# CONFIG_EXT4_FS_XATTR is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 # CONFIG_EZX_PCAP is not set
@@ -603,6 +613,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_UDL is not set
 # CONFIG_FB_VGA16 is not set
 # CONFIG_FB_VIA is not set
 # CONFIG_FB_VIRTUAL is not set
@@ -646,6 +657,8 @@ CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
+# CONFIG_GIGASET_CAPI is not set 
+# CONFIG_GIGASET_DEBUG is not set
 # CONFIG_GFS2_FS is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_DEVICE is not set
@@ -740,6 +753,7 @@ CONFIG_HOTPLUG=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_VIA is not set
 # CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
 CONFIG_HZ=100
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ_100=y
@@ -780,6 +794,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SCMI is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
@@ -906,7 +921,7 @@ CONFIG_INPUT_MISC=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
 # CONFIG_IP1000 is not set
-# CONFIG_IP175C_PHY is not set
+# CONFIG_IP17XX_PHY is not set
 # CONFIG_IP6_NF_FILTER is not set
 # CONFIG_IP6_NF_IPTABLES is not set
 # CONFIG_IP6_NF_MANGLE is not set
@@ -1043,7 +1058,22 @@ CONFIG_IPW2200_MONITOR=y
 # CONFIG_IRDA is not set
 # CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_EICON is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_I4L is not set
+# CONFIG_ISDN_WITH_ABC is not set
 # CONFIG_ISL29003 is not set
 # CONFIG_ISO9660_FS is not set
 # CONFIG_IWL3945 is not set
@@ -1078,6 +1108,7 @@ CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFS_STATISTICS is not set
 # CONFIG_JME is not set
 CONFIG_JOLIET=y
+# CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_KALLSYMS is not set
 # CONFIG_KARMA_PARTITION is not set
@@ -1103,8 +1134,7 @@ CONFIG_KMOD=y
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LATENCYTOP is not set
-# CONFIG_LBDAF is not set
-# CONFIG_LBD is not set
+CONFIG_LBDAF=y
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LEDS_ALIX is not set
 # CONFIG_LEDS_BD2802 is not set
@@ -1134,6 +1164,8 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LIBERTAS is not set
 # CONFIG_LIBERTAS_THINFIRM is not set
 # CONFIG_LIBERTAS_USB is not set
+# CONFIG_LIBERTAS_SDIO is not set
+# CONFIG_LIBERTAS_SPI is not set
 # CONFIG_LIBFC is not set
 # CONFIG_LIBFCOE is not set
 # CONFIG_LIBIPW_DEBUG is not set
@@ -1152,6 +1184,7 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LOGO is not set
 # CONFIG_LSF is not set
 # CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
 # CONFIG_LXT_PHY is not set
 CONFIG_MAC80211_DEFAULT_PS_VALUE=1
 CONFIG_MAC80211_DEFAULT_PS=y
@@ -1160,7 +1193,7 @@ CONFIG_MAC80211_DEFAULT_PS=y
 # CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MAC_PARTITION is not set
 # CONFIG_MACVLAN is not set
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MARKEINS is not set
 # CONFIG_MARKERS is not set
 # CONFIG_MARVELL_PHY is not set
@@ -1211,6 +1244,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_CB710 is not set
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC is not set
+# CONFIG_MMC_MVSDIO is not set
 # CONFIG_MMC_S3C is not set
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_SDRICOH_CS is not set
@@ -1310,6 +1344,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_TESTS is not set
 # CONFIG_MTD_UBI is not set
 CONFIG_MTD=y
+# CONFIG_MV643XX_ETH is not set
 # CONFIG_MVSWITCH_PHY is not set
 # CONFIG_MWAVE is not set
 # CONFIG_MWL8K is not set
@@ -1509,12 +1544,12 @@ CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFTL is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NL80211=y
@@ -1579,6 +1614,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OCF_SAFE is not set
 # CONFIG_OCF_TALITOS is not set
 # CONFIG_OMFS_FS is not set
+# CONFIG_ORION_WATCHDOG is not set
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_P54_COMMON is not set
 CONFIG_PACKET_MMAP=y
@@ -1644,10 +1680,14 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set
+# CONFIG_PCI 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_PCIEAER_INJECT is not set
 # CONFIG_PCIEASPM is not set
+# CONFIG_PCIE_ECRC is not set
 # CONFIG_PCI_HERMES is not set
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_LEGACY is not set
@@ -1656,7 +1696,6 @@ CONFIG_PARTITION_ADVANCED=y
 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
@@ -1677,6 +1716,8 @@ CONFIG_PCI=y
 # CONFIG_PCSPKR_PLATFORM is not set
 # CONFIG_PD6729 is not set
 # CONFIG_PDC_ADMA is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PERF_EVENTS is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_PHONE is not set
 # CONFIG_PHONET is not set
@@ -1696,6 +1737,7 @@ CONFIG_PLIST=y
 CONFIG_PPC_4K_PAGES=y
 CONFIG_PPC4xx_GPIO=y
 # CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PPC_DISABLE_WERROR is not set
 # CONFIG_PPC_EMULATED_STATS is not set
 # CONFIG_PPP_ASYNC is not set
 # CONFIG_PPP_BSDCOMP is not set
@@ -1719,6 +1761,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTK=y
 # CONFIG_PRISM2_USB is not set
 # CONFIG_PRISM54 is not set
+# CONFIG_PROBE_INITRD_HEADER is not set
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 # CONFIG_PROC_PAGE_MONITOR is not set
@@ -1842,6 +1885,7 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8366_SMI is not set
 # CONFIG_RTL8366S_PHY_DEBUG_FS is not set
 # CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RUNTIME_DEBUG is not set
@@ -1917,6 +1961,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_MPT2SAS is not set
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_SCSI_NSP32 is not set
@@ -1967,6 +2012,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_ADT7475 is not set
 # CONFIG_SENSORS_APPLESMC is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATK0110 is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_CORETEMP is not set
 # CONFIG_SENSORS_DME1737 is not set
@@ -1988,6 +2034,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # 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_LM63 is not set
 # CONFIG_SENSORS_LM70 is not set
 # CONFIG_SENSORS_LM75 is not set
@@ -2108,6 +2155,7 @@ CONFIG_SLAB=y
 # CONFIG_SND_CS46XX is not set
 # CONFIG_SND_CS5530 is not set
 # CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
 # CONFIG_SND_DARLA20 is not set
 # CONFIG_SND_DARLA24 is not set
 # CONFIG_SND_DEBUG is not set
@@ -2140,7 +2188,9 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_ICE1712 is not set
 # CONFIG_SND_ICE1724 is not set
 # CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
 # CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
 # CONFIG_SND_INDIGO is not set
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
@@ -2151,6 +2201,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LAYLA20 is not set
 # CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LX6464ES is not set
 # CONFIG_SND_MAESTRO3 is not set
 # CONFIG_SND_MIA is not set
 # CONFIG_SND_MIPS is not set
@@ -2167,13 +2218,14 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_OPTI93X is not set
 CONFIG_SND_OSSEMUL=y
 # CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCI is not set
+CONFIG_SND_PCI=y
 # CONFIG_SND_PCMCIA is not set
 # CONFIG_SND_PCM is not set
 # CONFIG_SND_PCM_OSS is not set
 CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_PCXHR is not set
 # CONFIG_SND_PDAUDIOCF is not set
+# CONFIG_SND_PPC is not set
 # CONFIG_SND_RAWMIDI is not set
 # CONFIG_SND_RIPTIDE is not set
 # CONFIG_SND_RME32 is not set
@@ -2186,6 +2238,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_SPI is not set
@@ -2212,6 +2265,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOLARIS_X86_PARTITION is not set
 # CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
 # CONFIG_SOUND is not set
 # CONFIG_SOUND_PRIME is not set
 # CONFIG_SPARSEMEM_MANUAL is not set
@@ -2223,6 +2277,8 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPI is not set
 # CONFIG_SPI_MASTER is not set
 # CONFIG_SPI_ORION is not set
+# CONFIG_SPI_PPC4xx is not set
+# CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_TLE62X0 is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
 # CONFIG_SQUASHFS_EMBEDDED is not set
@@ -2231,7 +2287,6 @@ CONFIG_SQUASHFS_LZMA=y
 CONFIG_SQUASHFS_SUPPORT_ZLIB=y
 # 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
@@ -2299,6 +2354,7 @@ CONFIG_TEXTSEARCH=y
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TIGON3 is not set
+# CONFIG_TIMER_STATS is not set
 CONFIG_TIMERFD=y
 # CONFIG_TINY_SHMEM is not set
 # CONFIG_TIPC is not set
@@ -2341,6 +2397,7 @@ CONFIG_TRACING_SUPPORT=y
 # CONFIG_TUN is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_UCB1400_CORE is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UDF_NLS=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -2762,6 +2819,8 @@ CONFIG_XFRM=y
 # CONFIG_XFS_QUOTA is not set
 # CONFIG_XFS_RT is not set
 # CONFIG_XFS_SECURITY is not set
+# CONFIG_XILINX_EMACLITE is not set
+# CONFIG_XILINX_LL_TEMAC is not set
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_YAFFS_FS is not set
 # CONFIG_YAM is not set