lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pcspkr: fix dependancies

Browse Source 
fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
CC: Vojtech Pavlik <vojtech@suse.cz>
CC: Michael Opdenacker <michael-lists@free-electrons.com>
[fixed for 2.6.26-rc1 by tiwai]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Stas Sergeev
2008-05-07 12:39:56 +02:00
committed by Takashi Iwai
parent a15306365a
commit e5e1d3cb20
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/Makefile
View File

@@ -83,9 +83,7 @@ obj-$(CONFIG_KVM_GUEST) += kvm.o
obj-$(CONFIG_KVM_CLOCK) += kvmclock.o obj-$(CONFIG_KVM_CLOCK) += kvmclock.o
obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o
ifdef CONFIG_INPUT_PCSPKR obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
obj-y += pcspeaker.o
endif
obj-$(CONFIG_SCx200) += scx200.o obj-$(CONFIG_SCx200) += scx200.o
scx200-y += scx200_32.o scx200-y += scx200_32.o

2
drivers/input/misc/Kconfig
View File

@@ -14,7 +14,7 @@ if INPUT_MISC
config INPUT_PCSPKR config INPUT_PCSPKR
tristate "PC Speaker support" tristate "PC Speaker support"
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES depends on PCSPKR_PLATFORM
depends on SND_PCSP=n depends on SND_PCSP=n
help help
Say Y here if you want the standard PC Speaker to be used for Say Y here if you want the standard PC Speaker to be used for

8
init/Kconfig
View File

@@ -634,6 +634,14 @@ 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
bool "Enable PC-Speaker support" if EMBEDDED
depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
default y
help
This option allows to disable the internal PC-Speaker
support, saving some memory.
config COMPAT_BRK config COMPAT_BRK
bool "Disable heap randomization" bool "Disable heap randomization"
default y default y

4
sound/drivers/Kconfig
View File

@@ -5,8 +5,8 @@ menu "Generic devices"
config SND_PCSP config SND_PCSP
tristate "Internal PC speaker support" tristate "PC-Speaker support"
depends on X86_PC && HIGH_RES_TIMERS depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
depends on INPUT depends on INPUT
depends on SND depends on SND
select SND_PCM select SND_PCM