* Ingo Molnar <mingo@elte.hu> wrote:i've added your patch to x86.git - see below. Ingo -----------> Subject: x86: fix unconditional arch/x86/kernel/pcspeaker.o compiling From: Michael Opdenacker <michael-lists@free-electrons.com> do not add the pcspkr platform device if pcspkr support is disabled. Signed-off-by: Michael Opdenacker <michael@free-electrons.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/x86/kernel/Makefile | 3 +++ 1 file changed, 3 insertions(+) Index: linux-x86.q/arch/x86/kernel/Makefile =================================================================== --- linux-x86.q.orig/arch/x86/kernel/Makefile +++ linux-x86.q/arch/x86/kernel/Makefile @@ -68,7 +68,10 @@ obj-$(CONFIG_MGEODE_LX) += geode_32.o m obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o + +ifdef CONFIG_INPUT_PCSPKR obj-y += pcspeaker.o +endif obj-$(CONFIG_SCx200) += scx200_32.o --
| Kok, Auke | Re: -mm merge plans for 2.6.23 - ioat/dma engine |
| Jeff Garzik | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Greg Kroah-Hartman | [PATCH 001/196] Chinese: Add the known_regression URI to the HOWTO |
| Matthew Garrett | [PATCH] Remove process freezer from suspend to RAM pathway |
| Gerrit Renker | [PATCH 15/37] dccp: Set per-connection CCIDs via socket options |
| David Miller | [GIT]: Networking |
| Jarek Poplawski | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Jens Axboe | Re: [BUG] New Kernel Bugs |
git: | |
