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>

arch/arm/mach-berlin/Kconfig

@@ -7,7 +7,6 @@ menuconfig ARCH_BERLIN
 	select DW_APB_TIMER_OF
 	select GENERIC_IRQ_CHIP
 	select PINCTRL
-	select RESET_CONTROLLER
 
 if ARCH_BERLIN