Message ID | 1388417849-7728-1-git-send-email-maxime.ripard@free-electrons.com |
---|---|
State | New |
Headers | show |
On Mon, Dec 30, 2013 at 04:37:29PM +0100, Maxime Ripard wrote: > The current code selects ARCH_HAS_RESET_CONTROLLER, that enables the > RESET_CONTROLLER option by default, but doesn't select it, so a configuration > might unselect it, leading to compilation error. > > Explictly select RESET_CONTROLLER so that we can't have this breakage anymore. > > Reported-by: Emilio López <emilio@elopez.com.ar> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Merged in sunxi/core-for-3.14. Maxime
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 547004c..6278b12 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -11,6 +11,7 @@ config ARCH_SUNXI select HAVE_SMP select PINCTRL select PINCTRL_SUNXI + select RESET_CONTROLLER select SPARSE_IRQ select SUN4I_TIMER select SUN5I_HSTIMER
The current code selects ARCH_HAS_RESET_CONTROLLER, that enables the RESET_CONTROLLER option by default, but doesn't select it, so a configuration might unselect it, leading to compilation error. Explictly select RESET_CONTROLLER so that we can't have this breakage anymore. Reported-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/mach-sunxi/Kconfig | 1 + 1 file changed, 1 insertion(+)