diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 17:05:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 17:05:15 -0500 |
| commit | f13399f033ae3d49e1808bacabd83d116844c94e (patch) | |
| tree | 1ac6a0344b7a43ddad6b6e69db819f11d2ec400a /arch/alpha/Kconfig | |
| parent | 049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8 (diff) | |
| parent | b2c32b32a21291107c3797448e0bd36716c8e445 (diff) | |
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 'arch/alpha/Kconfig')
| -rw-r--r-- | arch/alpha/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 8d2a4833acda..135c674eaf9e 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | config ALPHA | 1 | config ALPHA |
| 2 | bool | 2 | bool |
| 3 | default y | 3 | default y |
| 4 | select ARCH_MIGHT_HAVE_PC_PARPORT | ||
| 4 | select HAVE_AOUT | 5 | select HAVE_AOUT |
| 5 | select HAVE_IDE | 6 | select HAVE_IDE |
| 6 | select HAVE_OPROFILE | 7 | select HAVE_OPROFILE |