Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3414b863 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.13-defconfig' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents afa0e3fe 0f286c4c
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -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