summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-19 08:38:37 +0300
committerOlof Johansson <olof@lixom.net>2017-06-19 08:38:37 +0300
commit3414b86354985a339bba54f0bf47e061b9077740 (patch)
tree8d3f74a8483787ddcc0caef69fb717b68efe4e1c /arch/arm/configs
parentafa0e3fe34c7c6060f8879b5cc26d57a41ceebaf (diff)
parent0f286c4cb620c18206659d9ee91cf0f51d8839b6 (diff)
downloadlinux-3414b86354985a339bba54f0bf47e061b9077740.tar.xz
Merge tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig
defconfig for 4.13: - Switch sama5 to be tickless in idle and enable hrtimer - Add MCAN * tag 'at91-ab-4.13-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: ARM: configs: at91: add MCAN driver to sama5_defconfig ARM: configs: at91: enable HIGH_RES_TIMERS ARM: configs: at91: make system tickless when idle Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/sama5_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index 777c9e986425..e04494b830ab 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -3,6 +3,8 @@
CONFIG_SYSVIPC=y
CONFIG_FHANDLE=y
CONFIG_IRQ_DOMAIN_DEBUG=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_HIGH_RES_TIMERS=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_CGROUPS=y
CONFIG_BLK_DEV_INITRD=y
@@ -52,6 +54,7 @@ CONFIG_IP_PNP_RARP=y
CONFIG_IPV6_SIT_6RD=y
CONFIG_CAN=y
CONFIG_CAN_AT91=y
+CONFIG_CAN_M_CAN=y
CONFIG_CFG80211=y
CONFIG_MAC80211=y
CONFIG_MAC80211_LEDS=y