ARM: at91/defconfig: sama5_defconfig: updated
authorWenyou Yang <wenyou.yang@atmel.com>
Tue, 27 May 2014 12:45:21 +0000 (14:45 +0200)
committerOlof Johansson <olof@lixom.net>
Tue, 27 May 2014 16:46:06 +0000 (09:46 -0700)
due to enabling
-- CONFIG_REGULATOR
-- CONFIG_REGULATOR_ACT8865

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
[nicolas.ferre@atmel.com: move added entries to proper location within file]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/configs/sama5_defconfig

Simple merge