summaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2014-07-25 17:07:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-25 18:00:23 -0700
commitedffe1b626b39bd7121691dfdecb548431003bbb (patch)
treed58e47418603e05c9ce553f8d616b43f50395b5a /drivers/parport
parent32e6e5c34416672183caaddf16355f01d295e620 (diff)
downloadop-kernel-dev-edffe1b626b39bd7121691dfdecb548431003bbb.zip
op-kernel-dev-edffe1b626b39bd7121691dfdecb548431003bbb.tar.gz
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: d90c3eb31535 "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>
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/Kconfig12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 2872ece..44333bd 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -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
@@ -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
OpenPOWER on IntegriCloud