diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-12-10 20:25:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-12-10 20:25:44 +0000 |
| commit | 06660b607dd3d2cc9fe33741ba9930d9d556beb0 (patch) | |
| tree | 761dda59f991f6e1780529cfafec2fe7bcc627a8 /arch/arm/configs/cyanogenmod_n5100_defconfig | |
| parent | 74bcc029c6ab942f252477a74102877f7d093388 (diff) | |
| parent | e4e9a4953d8cc94a97d02de8fc63be758d8e6e84 (diff) | |
| download | kernel_samsung_smdk4412-06660b607dd3d2cc9fe33741ba9930d9d556beb0.zip kernel_samsung_smdk4412-06660b607dd3d2cc9fe33741ba9930d9d556beb0.tar.gz kernel_samsung_smdk4412-06660b607dd3d2cc9fe33741ba9930d9d556beb0.tar.bz2 | |
Merge "defconfig: patch other devices" into cm-11.0
Diffstat (limited to 'arch/arm/configs/cyanogenmod_n5100_defconfig')
| -rw-r--r-- | arch/arm/configs/cyanogenmod_n5100_defconfig | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/arch/arm/configs/cyanogenmod_n5100_defconfig b/arch/arm/configs/cyanogenmod_n5100_defconfig index b1f4e10..18d3c38 100644 --- a/arch/arm/configs/cyanogenmod_n5100_defconfig +++ b/arch/arm/configs/cyanogenmod_n5100_defconfig @@ -2142,6 +2142,7 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # CONFIG_USB_ZR364XX is not set # CONFIG_USB_STKWEBCAM is not set # CONFIG_USB_S2255 is not set +CONFIG_MALI_400MP_UMP=y CONFIG_VIDEO_SAMSUNG=y CONFIG_VIDEO_SAMSUNG_V4L2=y CONFIG_VIDEO_FIMC=y @@ -2170,21 +2171,6 @@ 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_VIDEO_MALI400MP=y -# CONFIG_MALI_DED_ONLY is not set -# CONFIG_MALI_DED_MMU is not set -CONFIG_MALI_OSMEM_ONLY=y -# CONFIG_MALI_DED_OSMEM is not set -# CONFIG_UMP_DED_ONLY is not set -CONFIG_UMP_OSMEM_ONLY=y -# CONFIG_UMP_VCM_ONLY is not set -CONFIG_UMP_MEM_SIZE=1024 -# CONFIG_MALI_UMP_R2P4_LSI is not set -# CONFIG_MALI_UMP_R3P1_LSI is not set -# CONFIG_VIDEO_MALI400MP_UMP_DEBUG is not set -# CONFIG_VIDEO_MALI400MP_STREAMLINE_PROFILING is not set -CONFIG_VIDEO_MALI400MP_DVFS=y -CONFIG_VIDEO_UMP=y CONFIG_VIDEO_FIMG2D=y # CONFIG_VIDEO_FIMG2D_DEBUG is not set CONFIG_VIDEO_FIMG2D4X=y @@ -2245,13 +2231,20 @@ CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y # # Graphics support # +# CONFIG_MALI_VER_BEFORE_R3P2 is not set # CONFIG_DRM is not set CONFIG_ION=y CONFIG_ION_EXYNOS=y CONFIG_ION_EXYNOS_CONTIGHEAP_SIZE=81920 # CONFIG_ION_EXYNOS_CONTIGHEAP_DEBUG is not set # CONFIG_VITHAR is not set -# CONFIG_VGASTATE is not set +CONFIG_MALI400=y +CONFIG_MALI_VER_R3P2=y +# CONFIG_MALI400_DEBUG is not set +# CONFIG_MALI400_PROFILING is not set +CONFIG_MALI_DVFS=y +CONFIG_MALI400_UMP=y +# CONFIG_MALI_SHARED_INTERRUPTS is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y # CONFIG_FIRMWARE_EDID is not set |