summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-10-17 11:32:08 +0200
committerArnd Bergmann <arnd@arndb.de>2017-10-19 22:54:58 +0200
commitf14100b2a4bb6ca4276c793cfdccd5cfdb089b2c (patch)
treed1d249883fc4cc7068244a5fda8d8d0f805c8728 /arch/arm/configs
parentMerge tag 'qcom-defconfig-for-4.15' of git://git.kernel.org/pub/scm/linux/ker... (diff)
downloadlinux-f14100b2a4bb6ca4276c793cfdccd5cfdb089b2c.tar.xz
linux-f14100b2a4bb6ca4276c793cfdccd5cfdb089b2c.zip
ARM: defconfig: select the right SX150X driver
The SX150X GPIO expander has been moved to pin control and its Kconfig symbol has been renamed. We used to have a paper-over thing in Kconfig but it was causing circular dependencies so I have had to kill it off. Select the right driver instead. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/lpc32xx_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
index e15fa5f168bb..0b54b4024e51 100644
--- a/arch/arm/configs/lpc32xx_defconfig
+++ b/arch/arm/configs/lpc32xx_defconfig
@@ -108,11 +108,11 @@ CONFIG_GPIO_MAX7300=y
CONFIG_GPIO_MAX732X=y
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_SX150X=y
CONFIG_GPIO_74X164=y
CONFIG_GPIO_MAX7301=y
CONFIG_GPIO_MC33880=y
CONFIG_PINCTRL_MCP23S08=y
+CONFIG_PINCTRL_SX150X=y
CONFIG_SENSORS_DS620=y
CONFIG_SENSORS_MAX6639=y
CONFIG_WATCHDOG=y