diff options
author | Randy Dunlap <rdunlap@infradead.org> | 2014-07-25 20:07:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-25 21:00:23 -0400 |
commit | edffe1b626b39bd7121691dfdecb548431003bbb (patch) | |
tree | d58e47418603e05c9ce553f8d616b43f50395b5a /drivers/parport | |
parent | 32e6e5c34416672183caaddf16355f01d295e620 (diff) |
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/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 2872ece81f35..44333bd8f908 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig | |||
@@ -5,6 +5,12 @@ | |||
5 | # Parport configuration. | 5 | # Parport configuration. |
6 | # | 6 | # |
7 | 7 | ||
8 | config ARCH_MIGHT_HAVE_PC_PARPORT | ||
9 | bool | ||
10 | help | ||
11 | Select this config option from the architecture Kconfig if | ||
12 | the architecture might have PC parallel port hardware. | ||
13 | |||
8 | menuconfig PARPORT | 14 | menuconfig PARPORT |
9 | tristate "Parallel port support" | 15 | tristate "Parallel port support" |
10 | depends on HAS_IOMEM | 16 | depends on HAS_IOMEM |
@@ -31,12 +37,6 @@ menuconfig PARPORT | |||
31 | 37 | ||
32 | If unsure, say Y. | 38 | If unsure, say Y. |
33 | 39 | ||
34 | config ARCH_MIGHT_HAVE_PC_PARPORT | ||
35 | bool | ||
36 | help | ||
37 | Select this config option from the architecture Kconfig if | ||
38 | the architecture might have PC parallel port hardware. | ||
39 | |||
40 | if PARPORT | 40 | if PARPORT |
41 | 41 | ||
42 | config PARPORT_PC | 42 | config PARPORT_PC |