[ppc40x] merge 2.6.28 patches

[openwrt.git] / target / linux / uml / config / i386

diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386
index 19c41ff..bc55df4 100644 (file)
--- a/target/linux/uml/config/i386
+++ b/target/linux/uml/config/i386
@@ -15,10 +15,7 @@ CONFIG_CLASSIC_RCU=y
 CONFIG_CON_CHAN="xterm"
 CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
 CONFIG_CRAMFS=y
-CONFIG_CRYPTO_AEAD=m
 # CONFIG_CRYPTO_AES_586 is not set
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_GF128MUL=m
 # CONFIG_CRYPTO_SALSA20_586 is not set
 # CONFIG_CRYPTO_TWOFISH_586 is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@@ -96,12 +93,6 @@ CONFIG_MPENTIUMII=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-# CONFIG_NFSD_V4 is not set
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_V3_ACL=y
-# CONFIG_NFS_V4 is not set
 CONFIG_NLS=y
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_15 is not set
@@ -124,6 +115,8 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_SLABINFO=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@ -172,5 +165,4 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_X86_WP_WORKS_OK=y
 CONFIG_X86_XADD=y
 CONFIG_XTERM_CHAN=y
-CONFIG_ZLIB_DEFLATE=m
 CONFIG_ZONE_DMA_FLAG=0