From: Linus Walleij Date: Wed, 29 Jan 2014 10:09:53 +0000 (+0100) Subject: mfd: Include all drivers in subsystem menu X-Git-Tag: v3.2.58~45 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb2da9df043b1151d37be156f4b78eee4d1bde87;p=pandora-kernel.git mfd: Include all drivers in subsystem menu commit a6e6e660baa5c583022e3e48c85316bace027825 upstream. 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. Signed-off-by: Linus Walleij Signed-off-by: Lee Jones [bwh: Backported to 3.2: adjust context] Signed-off-by: Ben Hutchings --- diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index f1391c21ef26..b2b69167b068 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -772,9 +772,6 @@ config MFD_INTEL_MSIC Passage) chip. This chip embeds audio, battery, GPIO, etc. devices used in Intel Medfield platforms. -endmenu -endif - menu "Multimedia Capabilities Port drivers" depends on ARCH_SA1100 @@ -797,3 +794,6 @@ config MCP_UCB1200_TS depends on MCP_UCB1200 && INPUT endmenu + +endmenu +endif