1 files changed, 15 insertions, 20 deletions
diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/cyanogenmod_i9300_defconfig
index d2e9025..64b8f61 100644
--- a/arch/arm/configs/cyanogenmod_i9300_defconfig
+++ b/arch/arm/configs/cyanogenmod_i9300_defconfig
@@ -180,8 +180,8 @@ CONFIG_LBDAF=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
-CONFIG_IOSCHED_ROW=y
-CONFIG_IOSCHED_SIO=y
+CONFIG_IOSCHED_ROW=n
+CONFIG_IOSCHED_SIO=n
 # CONFIG_DEFAULT_DEADLINE is not set
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_ROW is not set
@@ -676,9 +676,9 @@ CONFIG_VIRT_TO_BUS=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_CLEANCACHE is not set
-CONFIG_CMA=y
+CONFIG_CMA=n
 # CONFIG_CMA_DEVELOPEMENT is not set
-CONFIG_CMA_BEST_FIT=y
+CONFIG_CMA_BEST_FIT=n
 # CONFIG_DEBUG_VMALLOC is not set
 CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_ALIGNMENT_TRAP=y
@@ -687,8 +687,6 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
-CONFIG_VMWARE_MVP=y
-# CONFIG_VMWARE_MVP_DEBUG is not set
 
 #
 # Boot options
@@ -1202,7 +1200,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_SYNC=y
 CONFIG_SW_SYNC=y
 CONFIG_SW_SYNC_USER=y
-CONFIG_DMA_CMA=y
+CONFIG_DMA_CMA=n
 # CONFIG_DMA_CMA_DEBUG is not set
 
 #
@@ -1403,8 +1401,8 @@ CONFIG_BCM4334=y
 # CONFIG_BCM4335 is not set
 # CONFIG_BCM43241 is not set
 CONFIG_BROADCOM_WIFI=y
-CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
+#CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
+#CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
 CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
 CONFIG_WLAN_REGION_CODE=100
 # CONFIG_HOSTAP is not set
@@ -1662,8 +1660,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
-CONFIG_S3C_MEM=y
-CONFIG_EXYNOS_MEM=y
+CONFIG_S3C_MEM=n
+CONFIG_EXYNOS_MEM=n
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -1974,7 +1972,7 @@ CONFIG_VIDEO_V4L2=y
 CONFIG_V4L2_MEM2MEM_DEV=y
 CONFIG_VIDEOBUF2_CORE=y
 CONFIG_VIDEOBUF2_MEMOPS=y
-CONFIG_VIDEOBUF2_CMA_PHYS=y
+CONFIG_VIDEOBUF2_CMA_PHYS=n
 # CONFIG_VIDEOBUF2_ION is not set
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -2111,7 +2109,7 @@ CONFIG_MALI_400MP_UMP=y
 CONFIG_VIDEO_SAMSUNG=y
 CONFIG_VIDEO_SAMSUNG_V4L2=y
 CONFIG_VIDEO_FIMC=y
-CONFIG_USE_FIMC_CMA=y
+CONFIG_USE_FIMC_CMA=n
 CONFIG_VIDEO_FIMC_RANGE_NARROW=y
 # CONFIG_VIDEO_FIMC_RANGE_WIDE is not set
 # CONFIG_VIDEO_FIMC_DEBUG is not set
@@ -2137,7 +2135,7 @@ CONFIG_LSI_HDMI_AUDIO_CH_EVENT=y
 CONFIG_VIDEO_MFC5X=y
 CONFIG_VIDEO_MFC_MAX_INSTANCE=4
 # CONFIG_VIDEO_MFC5X_DEBUG is not set
-CONFIG_USE_MFC_CMA=y
+CONFIG_USE_MFC_CMA=n
 CONFIG_VIDEO_FIMG2D=y
 # CONFIG_VIDEO_FIMG2D_DEBUG is not set
 CONFIG_VIDEO_FIMG2D4X=y
@@ -2900,7 +2898,7 @@ CONFIG_SENSORS_LPS331=y
 # CONFIG_SENSORS_SSP_SENSORHUB is not set
 # CONFIG_PM_DEVFREQ is not set
 # CONFIG_SAMSUNG_PHONE_SVNET is not set
-CONFIG_ACCESSORY=y
+CONFIG_ACCESSORY=n
 # CONFIG_30PIN_CONN is not set
 # CONFIG_MHL_SII9234 is not set
 # CONFIG_SEC_KEYBOARD_DOCK is not set
@@ -2910,9 +2908,6 @@ CONFIG_ACCESSORY=y
 # CONFIG_EXTCON is not set
 # CONFIG_BARCODE_EMUL is not set
 # CONFIG_SAMSUNG_PHONE_TTY is not set
-CONFIG_MOBICORE_SUPPORT=y
-# CONFIG_MOBICORE_DEBUG is not set
-CONFIG_MOBICORE_API=y
 CONFIG_IOMMU_SUPPORT=y
 # CONFIG_FELICA is not set
 # CONFIG_AUTHENTEC_VPNCLIENT_INTERCEPTOR is not set
@@ -3232,7 +3227,7 @@ CONFIG_CRYPTO=y
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_FIPS_INTEG_OFFSET=0x20000000
+#CONFIG_CRYPTO_FIPS_INTEG_OFFSET=0x20000000
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
@@ -3245,7 +3240,7 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_MANAGER_TESTS=y
+#CONFIG_CRYPTO_MANAGER_TESTS=y
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCRYPT is not set