提交 8761f1ab 编写于 作者: R Ralf Baechle 提交者: Thomas Gleixner

pcspkr: Cleanup Kconfig dependencies

Lenghty lists of the kind "depends on ARCH1 || ARCH2 ... || ARCH123" are
usually either wrong or too coarse grained.  Or plain an ugly sin.

[ tglx: Fixed up amigaone ]
Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linux-alpha@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Gerhard Pircher <gerhard_pircher@gmx.net>
Link: http://lkml.kernel.org/r/20110601180610.984881988@duck.linux-mips.netSigned-off-by: NThomas Gleixner <tglx@linutronix.de>
上级 85049276
...@@ -6,6 +6,7 @@ config ALPHA ...@@ -6,6 +6,7 @@ config ALPHA
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_SYSCALL_WRAPPERS select HAVE_SYSCALL_WRAPPERS
select HAVE_IRQ_WORK select HAVE_IRQ_WORK
select HAVE_PCSPKR_PLATFORM
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
select HAVE_DMA_ATTRS select HAVE_DMA_ATTRS
select HAVE_GENERIC_HARDIRQS select HAVE_GENERIC_HARDIRQS
......
...@@ -5,6 +5,7 @@ config MIPS ...@@ -5,6 +5,7 @@ config MIPS
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_IRQ_WORK select HAVE_IRQ_WORK
select HAVE_PCSPKR_PLATFORM
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
select PERF_USE_VMALLOC select PERF_USE_VMALLOC
select HAVE_ARCH_KGDB select HAVE_ARCH_KGDB
......
...@@ -8,7 +8,7 @@ config AMIGAONE ...@@ -8,7 +8,7 @@ config AMIGAONE
select NOT_COHERENT_CACHE select NOT_COHERENT_CACHE
select CHECK_CACHE_COHERENCY select CHECK_CACHE_COHERENCY
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
select PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
help help
Select AmigaOne for the following machines: Select AmigaOne for the following machines:
- AmigaOne SE/Teron CX (G3 only) - AmigaOne SE/Teron CX (G3 only)
......
config PPC_CHRP config PPC_CHRP
bool "Common Hardware Reference Platform (CHRP) based machines" bool "Common Hardware Reference Platform (CHRP) based machines"
depends on 6xx depends on 6xx
select HAVE_PCSPKR_PLATFORM
select MPIC select MPIC
select PPC_I8259 select PPC_I8259
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
......
config PPC_PREP config PPC_PREP
bool "PowerPC Reference Platform (PReP) based machines" bool "PowerPC Reference Platform (PReP) based machines"
depends on 6xx && BROKEN depends on 6xx && BROKEN
select HAVE_PCSPKR_PLATFORM
select MPIC select MPIC
select PPC_I8259 select PPC_I8259
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
......
config PPC_PSERIES config PPC_PSERIES
depends on PPC64 && PPC_BOOK3S depends on PPC64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries" bool "IBM pSeries & new (POWER5-based) iSeries"
select HAVE_PCSPKR_PLATFORM
select MPIC select MPIC
select PCI_MSI select PCI_MSI
select PPC_XICS select PPC_XICS
......
...@@ -20,6 +20,7 @@ config X86 ...@@ -20,6 +20,7 @@ config X86
select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_UNSTABLE_SCHED_CLOCK
select HAVE_IDE select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_PCSPKR_PLATFORM
select HAVE_PERF_EVENTS select HAVE_PERF_EVENTS
select HAVE_IRQ_WORK select HAVE_IRQ_WORK
select HAVE_IOREMAP_PROT select HAVE_IOREMAP_PROT
......
...@@ -999,15 +999,19 @@ config ELF_CORE ...@@ -999,15 +999,19 @@ config ELF_CORE
help help
Enable support for generating core dumps. Disabling saves about 4k. Enable support for generating core dumps. Disabling saves about 4k.
config PCSPKR_PLATFORM config PCSPKR_PLATFORM
bool "Enable PC-Speaker support" if EXPERT bool "Enable PC-Speaker support" if EXPERT
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES depends on HAVE_PCSPKR_PLATFORM
select I8253_LOCK select I8253_LOCK
default y default y
help help
This option allows to disable the internal PC-Speaker This option allows to disable the internal PC-Speaker
support, saving some memory. support, saving some memory.
config HAVE_PCSPKR_PLATFORM
bool
config BASE_FULL config BASE_FULL
default y default y
bool "Enable full-sized data structures for core" if EXPERT bool "Enable full-sized data structures for core" if EXPERT
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册