Skip to content

Commit

Permalink
parport: fix menu breakage
Browse files Browse the repository at this point in the history
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: d90c3eb "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>
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Jul 26, 2014
1 parent 32e6e5c commit edffe1b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/parport/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
# 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
tristate "Parallel port support"
depends on HAS_IOMEM
Expand All @@ -31,12 +37,6 @@ menuconfig PARPORT

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

config PARPORT_PC
Expand Down

0 comments on commit edffe1b

Please sign in to comment.