summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorChanwoo Choi <cw00.choi@samsung.com>2014-10-15 19:01:14 +0900
committerChanho Park <chanho61.park@samsung.com>2014-11-18 12:00:59 +0900
commit8fd342d02504ed9b0bd72a388730b98d31067b03 (patch)
treef8503351f4ab29016104e5660b07d6f27b536539 /arch
parent6a3782b1805ddd5bea7f9fc9730e60bc498abc8e (diff)
downloadlinux-3.10-8fd342d02504ed9b0bd72a388730b98d31067b03.tar.gz
linux-3.10-8fd342d02504ed9b0bd72a388730b98d31067b03.tar.bz2
linux-3.10-8fd342d02504ed9b0bd72a388730b98d31067b03.zip
ARM: configs: tizen_rinato_defconfig: Disable s3c-rtc feature
This patch disables s3c-rtc feature becuase Rinato board don't use it. Change-Id: I3648618731b9d2554419fe04cd28c3c0c16943f9 Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tizen_rinato_defconfig9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/configs/tizen_rinato_defconfig b/arch/arm/configs/tizen_rinato_defconfig
index 19cc24e7476..744a439880e 100644
--- a/arch/arm/configs/tizen_rinato_defconfig
+++ b/arch/arm/configs/tizen_rinato_defconfig
@@ -202,6 +202,7 @@ CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_ARCH_JUMP_LABEL=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
@@ -638,6 +639,7 @@ CONFIG_XFRM_ALGO=y
# CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=y
CONFIG_NET_KEY=y
# CONFIG_NET_KEY_MIGRATE is not set
CONFIG_INET=y
@@ -650,7 +652,7 @@ CONFIG_IP_MULTIPLE_TABLES=y
# CONFIG_IP_PNP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE_DEMUX is not set
-# CONFIG_NET_IP_TUNNEL is not set
+CONFIG_NET_IP_TUNNEL=y
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_SYN_COOKIES is not set
@@ -658,7 +660,7 @@ CONFIG_INET_AH=y
CONFIG_INET_ESP=y
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_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_BEET is not set
@@ -2144,7 +2146,7 @@ CONFIG_RTC_DRV_S5M=y
# on-CPU RTC drivers
#
CONFIG_HAVE_S3C_RTC=y
-CONFIG_RTC_DRV_S3C=y
+# CONFIG_RTC_DRV_S3C is not set
# CONFIG_RTC_DRV_PL030 is not set
# CONFIG_RTC_DRV_PL031 is not set
# CONFIG_RTC_DRV_SNVS is not set
@@ -2520,6 +2522,7 @@ CONFIG_FS_MBCACHE=y
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
# CONFIG_DNOTIFY is not set