diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2014-03-18 11:25:11 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-03-18 11:25:11 +0100 |
| commit | 72249651843f93d50c302833546fb2880052a80f (patch) | |
| tree | 172a8af74ce161bc276856d7331dc0076055093c /arch/arm/configs/twr_vf600_defconfig | |
| parent | aef4075a0bcc7860eafa17be0c6e6cfcecc68206 (diff) | |
| parent | 50c4c848d6b8743894cfcec166db475ef6140504 (diff) | |
Merge tag '3.0-vybrid-ts2.13' into colibri_vfColibri_VF_LinuxImageV2.1Beta3_20140318
3.0-vybrid-ts2.13
Diffstat (limited to 'arch/arm/configs/twr_vf600_defconfig')
| -rw-r--r-- | arch/arm/configs/twr_vf600_defconfig | 7 |
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 |