aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-25 05:09:48 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-25 05:09:48 +0100
commitf0fb4b75b6d61c1e98b8b6b2411cbac144b98fb7 (patch)
tree52c368412d7fffc7e699a1db3ef488e003bc62c1 /arch/arm
parent481c44e9719d538f474be9b984e17484bfa6c3c8 (diff)
downloadkernel_samsung_smdk4412-f0fb4b75b6d61c1e98b8b6b2411cbac144b98fb7.zip
kernel_samsung_smdk4412-f0fb4b75b6d61c1e98b8b6b2411cbac144b98fb7.tar.gz
kernel_samsung_smdk4412-f0fb4b75b6d61c1e98b8b6b2411cbac144b98fb7.tar.bz2
disable some cma interfaces, so we can easier remove the dependency later
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/cyanogenmod_i9300_defconfig12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/cyanogenmod_i9300_defconfig
index b1d5f2c..937500a 100644
--- a/arch/arm/configs/cyanogenmod_i9300_defconfig
+++ b/arch/arm/configs/cyanogenmod_i9300_defconfig
@@ -1199,7 +1199,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
#
@@ -1659,8 +1659,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
@@ -1971,7 +1971,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
@@ -2108,7 +2108,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
@@ -2134,7 +2134,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