From: Maxime Ripard Date: Thu, 22 May 2014 14:47:12 +0000 (+0200) Subject: pinctrl: sunxi: Fix recursive dependency X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~31^2~16 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=118c565a8f2e0a1857715b8f6a6cfd337f19e904;p=pandora-kernel.git pinctrl: sunxi: Fix recursive dependency Fix the following configuration error: drivers/pinctrl/sunxi/Kconfig:3:error: recursive dependency detected! drivers/pinctrl/sunxi/Kconfig:3: symbol PINCTRL_SUNXI is selected by PINCTRL_SUN4I_A10 drivers/pinctrl/sunxi/Kconfig:9: symbol PINCTRL_SUN4I_A10 default value contains PINCTRL_SUNXI Add a new intermedia PINCTRL_SUNXI_COMMON, that superseeds the PINCTRL_SUNXI one. We still need to keep PINCTRL_SUNXI at the moment in order to preserve bisectability. Indeed, during that merge window, we also introduced the MACH_SUN* symbols. Since it's going through different trees, we can't rely on the fact that the options will be there, while ARCH_SUNXI still select PINCTRL_SUNXI. Signed-off-by: Maxime Ripard Suggested-by: Arnd Bergmann Signed-off-by: Linus Walleij --- Reading git-diff-tree failed