From: Michael Opdenacker <michael-lists@free-electrons.com>
Date: Wed, 30 Jan 2008 12:33:18 +0000 (+0100)
Subject: x86: fix unconditional arch/x86/kernel/pcspeaker.o compiling
X-Git-Tag: v2.6.25-rc1~1143^2~250
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=67926892ef7a7fbc76de607120d44416019fdf07;p=linux-2.6-omap-h63xx.git

x86: fix unconditional arch/x86/kernel/pcspeaker.o compiling

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>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index c414c45a0f1..5bdb0f0431e 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -67,7 +67,10 @@ obj-$(CONFIG_MGEODE_LX)		+= geode_32.o mfgpt_32.o
 
 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