Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5e1d3cb authored by Stas Sergeev's avatar Stas Sergeev Committed by Takashi Iwai
Browse files

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: default avatarStas Sergeev <stsp@aknet.ru>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDmitry 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: default avatarTakashi Iwai <tiwai@suse.de>
parent a1530636

arch/x86/kernel/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ obj-$(CONFIG_KVM_GUEST) += kvm.o 
obj-$(CONFIG_KVM_CLOCK)		+= kvmclock.o

obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o



ifdef CONFIG_INPUT_PCSPKR

obj-y				+= pcspeaker.o

endif

obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o



obj-$(CONFIG_SCx200)		+= scx200.o

scx200-y			+= scx200_32.o

drivers/input/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ if INPUT_MISC 


config INPUT_PCSPKR

	tristate "PC Speaker support"

	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES

	depends on PCSPKR_PLATFORM

	depends on SND_PCSP=n

	help

	  Say Y here if you want the standard PC Speaker to be used for

init/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -634,6 +634,14 @@ config ELF_CORE 
	help

	  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

	bool "Disable heap randomization"

	default y

sound/drivers/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ menu "Generic devices" 




config SND_PCSP

	tristate "Internal PC speaker support"

	depends on X86_PC && HIGH_RES_TIMERS

	tristate "PC-Speaker support"

	depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS

	depends on INPUT

	depends on SND

	select SND_PCM