linux/3.3: merge recent ubifs patches from 3.2

[oweals/openwrt.git] / target / linux / generic / config-3.2

diff --git a/target/linux/generic/config-3.2 b/target/linux/generic/config-3.2
index 51d99124540383ec2f64711f094bddde3cdc047a..c4be769cd12f8345f79965350702305e65b5093f 100644 (file)
--- a/target/linux/generic/config-3.2
+++ b/target/linux/generic/config-3.2
@@ -487,6 +487,7 @@ CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_XZ is not set
 # CONFIG_CRYPTO_ZLIB is not set
 # CONFIG_CRYSTALHD is not set
 # CONFIG_CS5535_MFGPT is not set
@@ -868,6 +869,7 @@ CONFIG_HOTPLUG=y
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_GEODE is not set
 # CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_PPC4XX is not set
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_VIA is not set
 # CONFIG_HYPERV is not set
@@ -932,13 +934,15 @@ CONFIG_HZ_100=y
 # CONFIG_I82092 is not set
 # CONFIG_I82365 is not set
 # CONFIG_IBM_ASM 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
+# CONFIG_IBM_EMAC is not set
+# CONFIG_IBM_EMAC_DEBUG is not set
+# CONFIG_IBM_EMAC_EMAC4 is not set
+# CONFIG_IBM_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_IBM_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_EMAC_RGMII is not set
+# CONFIG_IBM_EMAC_TAH is not set
+# CONFIG_IBM_EMAC_ZMII is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_IDE is not set
@@ -1705,6 +1709,7 @@ CONFIG_NET_VENDOR_EXAR=y
 CONFIG_NET_VENDOR_FARADAY=y
 CONFIG_NET_VENDOR_FUJITSU=y
 CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_IBM=y
 CONFIG_NET_VENDOR_INTEL=y
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_NET_VENDOR_MARVELL=y
@@ -1726,7 +1731,9 @@ CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_TOSHIBA=y
 CONFIG_NET_VENDOR_VIA=y
+CONFIG_NET_VENDOR_XILINX=y
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_NEW_LEDS=y
 # CONFIG_NFC_DEVICES is not set
@@ -2006,6 +2013,7 @@ CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_PPC_DISABLE_WERROR is not set
 # CONFIG_PPC_EMULATED_STATS is not set
+# CONFIG_PPC_EPAPR_HV_BYTECHAN
 # CONFIG_PPP is not set
 # CONFIG_PPPOATM is not set
 # CONFIG_PPPOE is not set
@@ -2254,6 +2262,7 @@ CONFIG_SCSI_MOD=y
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_MVSAS is not set
 # CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
 # CONFIG_SCSI_MVUMI is not set
 # CONFIG_SCSI_NCR53C406A is not set
 # CONFIG_SCSI_NETLINK is not set
@@ -2400,6 +2409,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_DW is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=2
 # CONFIG_SERIAL_8250_PCI is not set
@@ -2445,6 +2455,7 @@ CONFIG_SIGNALFD=y
 # CONFIG_SIS190 is not set
 # CONFIG_SIS900 is not set
 # CONFIG_SKGE is not set
+# CONFIG_SKGE_GENESIS is not set
 # CONFIG_SKY2 is not set
 # CONFIG_SKY2_DEBUG is not set
 CONFIG_SLAB=y
@@ -2568,6 +2579,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_PCXHR is not set
 # CONFIG_SND_PDAUDIOCF is not set
 # CONFIG_SND_PORTMAN2X4 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