From: Antoine Tenart <antoine.tenart@free-electrons.com>
Date: Mon, 17 Nov 2014 13:33:12 +0000 (+0100)
Subject: ARM: berlin: do not select RESET_CONTROLLER
X-Git-Tag: v3.19-rc1~169^2~11^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=81906906d8d95837c87b934a1a929cc43b61f4ee;p=linux.git

ARM: berlin: do not select RESET_CONTROLLER

RESET_CONTROLLER is meant to be user-selectable. To respect that,
do not select it automatically when using ARCH_BERLIN.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---

diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 84d34e07209c..3e40a947f3ea 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/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