Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'berlin-soc-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc

Pull "Berlin SoC changes for v3.19 (round 2)" from Sebastian Hesselbarth:

- Do not select RESET_CONTROLLER as it is user selectable

* tag 'berlin-soc-3.19-2' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: berlin: do not select RESET_CONTROLLER

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

-1
-1
arch/arm/mach-berlin/Kconfig
··· 7 7 select DW_APB_TIMER_OF 8 8 select GENERIC_IRQ_CHIP 9 9 select PINCTRL 10 - select RESET_CONTROLLER 11 10 12 11 if ARCH_BERLIN 13 12