summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/Kconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-01-29 11:09:53 +0100
committerLee Jones <lee.jones@linaro.org>2014-03-19 09:58:01 +0100
commita6e6e660baa5c583022e3e48c85316bace027825 (patch)
tree5ccf96519db932b5c3e176419fb64d997c557b8b /drivers/mfd/Kconfig
parentMerge branch 'ib-mfd-io-3.15' into HEAD (diff)
downloadlinux-a6e6e660baa5c583022e3e48c85316bace027825.tar.xz
linux-a6e6e660baa5c583022e3e48c85316bace027825.zip
mfd: Include all drivers in subsystem menu
It is currently not possible to select the SA1100 or Vexpress drivers in the MFD subsystem, because the menu for the entire subsystem ends before these options are presented. Move the main menu closing and the endif for HAS_IOMEM to the end of the file so these are selectable again. Cc: stable@vger.kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/Kconfig')
-rw-r--r--drivers/mfd/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 23a8a51f6860..30fbacfe8b3b 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1183,9 +1183,6 @@ config MFD_STW481X
in various ST Microelectronics and ST-Ericsson embedded
Nomadik series.
-endmenu
-endif
-
menu "Multimedia Capabilities Port drivers"
depends on ARCH_SA1100
@@ -1216,3 +1213,6 @@ config VEXPRESS_CONFIG
help
Platform configuration infrastructure for the ARM Ltd.
Versatile Express.
+
+endmenu
+endif