From 5cd9c9ee8c8c43d9a97d2ee1c9f5b0da20668e36 Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Sat, 21 Jul 2012 23:06:09 +0200 Subject: updated cm defconfig --- arch/arm/configs/cyanogenmod_i9300_defconfig | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'arch/arm/configs/cyanogenmod_i9300_defconfig') diff --git a/arch/arm/configs/cyanogenmod_i9300_defconfig b/arch/arm/configs/cyanogenmod_i9300_defconfig index c536418..633452f 100644 --- a/arch/arm/configs/cyanogenmod_i9300_defconfig +++ b/arch/arm/configs/cyanogenmod_i9300_defconfig @@ -414,6 +414,7 @@ CONFIG_BUSFREQ_QOS_NONE=y CONFIG_SEC_THERMISTOR=y # CONFIG_EXYNOS_SYSREG_PM is not set CONFIG_ANDROID_WIP=y +# CONFIG_COMPACTION_RETRY is not set # # EXYNOS4 Machines @@ -790,7 +791,7 @@ CONFIG_INET_ESP=y # CONFIG_INET_XFRM_TUNNEL is not set CONFIG_INET_TUNNEL=y CONFIG_INET_XFRM_MODE_TRANSPORT=y -# CONFIG_INET_XFRM_MODE_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TUNNEL=y # CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set CONFIG_INET_DIAG=y @@ -852,7 +853,7 @@ CONFIG_NF_CONNTRACK_NETBIOS_NS=y # CONFIG_NF_CONNTRACK_SNMP is not set CONFIG_NF_CONNTRACK_PPTP=y CONFIG_NF_CONNTRACK_SANE=y -CONFIG_NF_CONNTRACK_SIP=y +# CONFIG_NF_CONNTRACK_SIP is not set CONFIG_NF_CONNTRACK_TFTP=y CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_TPROXY=y @@ -962,7 +963,7 @@ CONFIG_NF_NAT_TFTP=y CONFIG_NF_NAT_AMANDA=y CONFIG_NF_NAT_PPTP=y CONFIG_NF_NAT_H323=y -CONFIG_NF_NAT_SIP=y +# CONFIG_NF_NAT_SIP is not set CONFIG_IP_NF_MANGLE=y # CONFIG_IP_NF_TARGET_CLUSTERIP is not set # CONFIG_IP_NF_TARGET_ECN is not set @@ -2056,7 +2057,7 @@ CONFIG_JPEG_V2_1=y # # Reserved memory configurations # -CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC0=61464 +CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC0=62464 CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC1=15360 CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC2=0 CONFIG_VIDEO_SAMSUNG_MEMSIZE_FIMC3=0 @@ -2143,6 +2144,9 @@ CONFIG_FB_S5P_MIPI_DSIM=y # CONFIG_FB_S5P_DUMMY_MIPI_LCD is not set CONFIG_FB_S5P_S6E8AA0=y # CONFIG_FB_S5P_S6D6AA1 is not set +# CONFIG_FB_S5P_S6E63M0 is not set +# CONFIG_S6E8AA0_AMS529HA01 is not set +CONFIG_S6E8AA0_AMS480GYXX=y CONFIG_AID_DIMMING=y CONFIG_LCD_FREQ_SWITCH=y CONFIG_FB_S5P_EXTDSP=y -- cgit v1.1