Eric Lee / smarc-ti-linux-kernel

5
Download as
Browse Code ยป

Commit edffe1b626b39bd7121691dfdecb548431003bbb

Authored by Randy Dunlap
Committed by Linus Torvalds
1 parent 32e6e5c344
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

drivers/parport/Kconfig
Diff comments   View file @ edffe1b
... ... @@ -5,6 +5,12 @@
5 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 14 menuconfig PARPORT
9 15 tristate "Parallel port support"
10 16 depends on HAS_IOMEM
... ... @@ -30,12 +36,6 @@
30 36 look at <file:Documentation/parport.txt>.
31 37  
32 38 If unsure, say Y.
33   -
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 39  
40 40 if PARPORT
41 41