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: Ralf 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: Benjamin 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.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 60219bf9419884587ed0c6172a084cd5555bddbf..ca2da8da6e9c68f057d0a393de2c0018c32c9d1d 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -6,6 +6,7 @@ config ALPHA
        select HAVE_OPROFILE
        select HAVE_SYSCALL_WRAPPERS
        select HAVE_IRQ_WORK
+       select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
        select HAVE_DMA_ATTRS
        select HAVE_GENERIC_HARDIRQS

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 653da62d0682b06bc0df0cf489dc1059a554faec..bf35bb6b3bc106e654a5994227a5f5150fbc3ca0 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -5,6 +5,7 @@ config MIPS
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_IRQ_WORK
+       select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
        select PERF_USE_VMALLOC
        select HAVE_ARCH_KGDB

diff --git a/arch/powerpc/platforms/amigaone/Kconfig b/arch/powerpc/platforms/amigaone/Kconfig
index 02247671771862b07581a9a0ae85ca345ff36abd..128de25cc28435a334384c1e7b0da38b0119d716 100644 (file)
--- a/arch/powerpc/platforms/amigaone/Kconfig
+++ b/arch/powerpc/platforms/amigaone/Kconfig
@@ -8,7 +8,7 @@ config AMIGAONE
        select NOT_COHERENT_CACHE
        select CHECK_CACHE_COHERENCY
        select DEFAULT_UIMAGE
-       select PCSPKR_PLATFORM
+       select HAVE_PCSPKR_PLATFORM
        help
        Select AmigaOne for the following machines:
        - AmigaOne SE/Teron CX (G3 only)

diff --git a/arch/powerpc/platforms/chrp/Kconfig b/arch/powerpc/platforms/chrp/Kconfig
index bc0b0efdc5fe81c3969349d2814ebe3a665484b9..d3cdab582c5d74d23b4b0c3fa77600cfd5e729c8 100644 (file)
--- a/arch/powerpc/platforms/chrp/Kconfig
+++ b/arch/powerpc/platforms/chrp/Kconfig
@@ -1,6 +1,7 @@
 config PPC_CHRP
        bool "Common Hardware Reference Platform (CHRP) based machines"
        depends on 6xx
+       select HAVE_PCSPKR_PLATFORM
        select MPIC
        select PPC_I8259
        select PPC_INDIRECT_PCI

diff --git a/arch/powerpc/platforms/prep/Kconfig b/arch/powerpc/platforms/prep/Kconfig
index bf8330ef2e768771a0be8004ee40b06a411d1c10..f0536c7cda9f26056cdb2404a3094ca42207feb4 100644 (file)
--- a/arch/powerpc/platforms/prep/Kconfig
+++ b/arch/powerpc/platforms/prep/Kconfig
@@ -1,6 +1,7 @@
 config PPC_PREP
        bool "PowerPC Reference Platform (PReP) based machines"
        depends on 6xx && BROKEN
+       select HAVE_PCSPKR_PLATFORM
        select MPIC
        select PPC_I8259
        select PPC_INDIRECT_PCI

diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 71af4c5d6c05cd143cd8036085f85575b4b96e37..05cf4769b88cd0e6f0fc7292a2f4a394d84a27e7 100644 (file)
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -1,6 +1,7 @@
 config PPC_PSERIES
        depends on PPC64 && PPC_BOOK3S
        bool "IBM pSeries & new (POWER5-based) iSeries"
+       select HAVE_PCSPKR_PLATFORM
        select MPIC
        select PCI_MSI
        select PPC_XICS

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e6060a1c1b5816c94e3c1381522a9f9d98cf0dc9..2dd95b55567b2ccbdc637b38cdbc0b01312e3b13 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -20,6 +20,7 @@ config X86
        select HAVE_UNSTABLE_SCHED_CLOCK
        select HAVE_IDE
        select HAVE_OPROFILE
+       select HAVE_PCSPKR_PLATFORM
        select HAVE_PERF_EVENTS
        select HAVE_IRQ_WORK
        select HAVE_IOREMAP_PROT

diff --git a/init/Kconfig b/init/Kconfig
index 2d2ef447a9abdd4be4fae030107c8ffe8aa69bb4..6f0e9d50fda9c61b65c581cb32e9c8c9193527f9 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -999,15 +999,19 @@ config ELF_CORE
        help
          Enable support for generating core dumps. Disabling saves about 4k.
 
+
 config PCSPKR_PLATFORM
        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
        default y
        help
           This option allows to disable the internal PC-Speaker
           support, saving some memory.
 
+config HAVE_PCSPKR_PLATFORM
+       bool
+
 config BASE_FULL
        default y
        bool "Enable full-sized data structures for core" if EXPERT