Merge "Comcerto: Enable ZONE_DMA"
diff --git a/arch/arm/configs/gfsc100_defconfig b/arch/arm/configs/gfsc100_defconfig
index 2c820e6..9c00fa7 100644
--- a/arch/arm/configs/gfsc100_defconfig
+++ b/arch/arm/configs/gfsc100_defconfig
@@ -19,7 +19,6 @@
CONFIG_PRINTK_PERSIST=y
CONFIG_BOOTLOG_COPY=y
# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
CONFIG_PROFILING=y
CONFIG_OPROFILE=m
CONFIG_MODULES=y
@@ -288,7 +287,6 @@
CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_AUTHENC=y
CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_SHA1=y