提交 e5e1d3cb 编写于 作者: S Stas Sergeev 提交者: Takashi Iwai

pcspkr: fix dependancies

fix pcspkr dependancies: make the pcspkr platform
drivers to depend on a platform device, and
not the other way around.
Signed-off-by: NStas Sergeev <stsp@aknet.ru>
Acked-by: NThomas Gleixner <tglx@linutronix.de>
Acked-by: NDmitry 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: NTakashi Iwai <tiwai@suse.de>
上级 a1530636
...@@ -83,9 +83,7 @@ obj-$(CONFIG_KVM_GUEST) += kvm.o ...@@ -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
......
...@@ -14,7 +14,7 @@ if INPUT_MISC ...@@ -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
......
...@@ -634,6 +634,14 @@ config ELF_CORE ...@@ -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
......
...@@ -5,8 +5,8 @@ menu "Generic devices" ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册