Commit edffe1b6 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

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: d90c3eb3 "Kconfig cleanup (PARPORT_PC dependencies)"

Signed-off-by: default avatarRandy 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 32e6e5c3

drivers/parport/Kconfig

+6 −6
Original line number Original line Diff line number Diff line
@@ -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