diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 23:05:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 23:05:15 +0100 |
| commit | f13399f033ae3d49e1808bacabd83d116844c94e (patch) | |
| tree | 1ac6a0344b7a43ddad6b6e69db819f11d2ec400a /drivers | |
| parent | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | c6x: remove unused COMMON_CLKDEV Kconfig parameter (diff) | |
| download | linux-f13399f033ae3d49e1808bacabd83d116844c94e.tar.xz linux-f13399f033ae3d49e1808bacabd83d116844c94e.zip | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull Kconfig cleanups from Mark Salter:
"Remove some unused config options from C6X and clean up PC_PARPORT
dependencies. The latter was discussed here:
https://lkml.org/lkml/2013/10/8/12"
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
c6x: remove unused COMMON_CLKDEV Kconfig parameter
Kconfig cleanup (PARPORT_PC dependencies)
x86: select ARCH_MIGHT_HAVE_PC_PARPORT
unicore32: select ARCH_MIGHT_HAVE_PC_PARPORT
sparc: select ARCH_MIGHT_HAVE_PC_PARPORT
sh: select ARCH_MIGHT_HAVE_PC_PARPORT
powerpc: select ARCH_MIGHT_HAVE_PC_PARPORT
parisc: select ARCH_MIGHT_HAVE_PC_PARPORT
mips: select ARCH_MIGHT_HAVE_PC_PARPORT
microblaze: select ARCH_MIGHT_HAVE_PC_PARPORT
m68k: select ARCH_MIGHT_HAVE_PC_PARPORT
ia64: select ARCH_MIGHT_HAVE_PC_PARPORT
arm: select ARCH_MIGHT_HAVE_PC_PARPORT
alpha: select ARCH_MIGHT_HAVE_PC_PARPORT
c6x: remove unused parameter in Kconfig
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/parport/Kconfig | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index dc82ef096f3b..2872ece81f35 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@ -31,15 +31,18 @@ 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 tristate "PC-style hardware" - depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \ - (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \ - !XTENSA && !CRIS - - ---help--- + depends on ARCH_MIGHT_HAVE_PC_PARPORT + help You should say Y here if you have a PC-style parallel port. All IBM PC compatible computers and some Alphas have PC-style parallel ports. PA-RISC owners should only say Y here if they |