Messages in this thread | | | Date | Thu, 08 May 2008 15:58:40 +0200 | From | Takashi Iwai <> | Subject | Re: [patch] pcspkr: fix dependancies |
| |
At Thu, 08 May 2008 21:50:03 +0400, Stas Sergeev wrote: > > Hello. > > Takashi Iwai wrote: > > This could be replaced now better with > > obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o > > These two chunks don't apply on 2.6.26-git tree. Please recreate the > > patch. > Done. > Could you please apply?
Ah sorry, forgot to follow up that I had already fixed and applied your patch to my git tree. Since it passed some build tests, I'll submit the pull request soon later.
thanks,
Takashi
> > --- > 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> > [2 pcsp_dep3.diff <text/x-patch (7bit)>] > --- a/init/Kconfig 2008-04-26 13:40:20.000000000 +0400 > +++ b/init/Kconfig 2008-04-26 18:20:40.000000000 +0400 > @@ -634,6 +634,14 @@ > 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 > --- a/arch/x86/kernel/Makefile 2008-04-26 13:40:06.000000000 +0400 > +++ b/arch/x86/kernel/Makefile 2008-04-26 18:22:49.000000000 +0400 > @@ -83,9 +83,7 @@ > 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 > --- a/sound/drivers/Kconfig 2008-04-26 13:40:21.000000000 +0400 > +++ b/sound/drivers/Kconfig 2008-04-26 18:24:59.000000000 +0400 > @@ -5,7 +5,8 @@ > > > config SND_PCSP > - tristate "Internal PC speaker support" > + tristate "PC-Speaker support" > + depends on PCSPKR_PLATFORM > depends on X86_PC && HIGH_RES_TIMERS > depends on INPUT > depends on SND > --- a/drivers/input/misc/Kconfig 2008-04-22 20:50:41.000000000 +0400 > +++ b/drivers/input/misc/Kconfig 2008-04-26 18:23:32.000000000 +0400 > @@ -14,7 +14,7 @@ > > 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
| |