Fresh pull from upstream

[librecmc/librecmc.git] / target / linux / xburst / config-3.18

diff --git a/target/linux/xburst/config-3.18 b/target/linux/xburst/config-3.18
index fbc2891673b906d408081cdcf6d97c639101446b..71411bf067cd91969f9d6069dae99f4d69418b9f 100644 (file)
--- a/target/linux/xburst/config-3.18
+++ b/target/linux/xburst/config-3.18
@@ -40,7 +40,6 @@ CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_XZ=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_JZ4740=y
@@ -316,7 +315,6 @@ CONFIG_TREE_PREEMPT_RCU=y
 CONFIG_UBIFS_FS=y
 CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_XZ=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_USB=y