summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnthony Felice <tony.felice@timesys.com>2014-01-09 16:09:52 -0500
committerAnthony Felice <tony.felice@timesys.com>2014-01-09 16:09:52 -0500
commit3028181b4c1a1e078422b5de929605d893d60d1a (patch)
treef69be649767f67c785afaf6680061fbdbe925598 /arch
parent1c32717d5eb9ac0fc211b14d7231d6ce63f0806c (diff)
Update twr_vf600 defconfig to use global timer by default3.0-vybrid-ts2.11
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/twr_vf600_defconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/configs/twr_vf600_defconfig b/arch/arm/configs/twr_vf600_defconfig
index d5267daeb899..e8a59f92e298 100644
--- a/arch/arm/configs/twr_vf600_defconfig
+++ b/arch/arm/configs/twr_vf600_defconfig
@@ -292,7 +292,6 @@ CONFIG_ISP1504_MXC=y
# CONFIG_MXC_PWM is not set
# CONFIG_MXC_DEBUG_BOARD is not set
CONFIG_HAVE_PIT=y
-CONFIG_MXC_USE_PIT=y
CONFIG_ARCH_MXC_IOMUX_V3=y
CONFIG_ARCH_MXC_AUDMUX_V2=y
CONFIG_IRAM_ALLOC=y
@@ -355,8 +354,9 @@ CONFIG_ARM_GIC=y
#
# Kernel Features
#
-# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
# CONFIG_VMSPLIT_3G is not set
CONFIG_VMSPLIT_2G=y
@@ -1432,6 +1432,7 @@ CONFIG_SND_OSSEMUL=y
# CONFIG_SND_MIXER_OSS is not set
CONFIG_SND_PCM_OSS=y
CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_HRTIMER is not set
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y