parport: fix menu breakage

Do not split the PARPORT-related symbols with the new kconfig
symbol ARCH_MIGHT_HAVE_PC_PARPORT. The split was causing incorrect
display of these symbols -- they were not being displayed together
as they should be.

Fixes: d90c3eb315 "Kconfig cleanup (PARPORT_PC dependencies)"

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: stable@vger.kernel.org # for 3.13, 3.14, 3.15
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Randy Dunlap 2014-07-25 17:07:47 -07:00 committed by Linus Torvalds
parent 32e6e5c344
commit edffe1b626

View File

@ -5,6 +5,12 @@
# Parport configuration. # Parport configuration.
# #
config ARCH_MIGHT_HAVE_PC_PARPORT
bool
help
Select this config option from the architecture Kconfig if
the architecture might have PC parallel port hardware.
menuconfig PARPORT menuconfig PARPORT
tristate "Parallel port support" tristate "Parallel port support"
depends on HAS_IOMEM depends on HAS_IOMEM
@ -31,12 +37,6 @@ menuconfig PARPORT
If unsure, say Y. If unsure, say Y.
config ARCH_MIGHT_HAVE_PC_PARPORT
bool
help
Select this config option from the architecture Kconfig if
the architecture might have PC parallel port hardware.
if PARPORT if PARPORT
config PARPORT_PC config PARPORT_PC