Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=67926892ef7a7fbc76de607120d44416019fdf07
Commit:     67926892ef7a7fbc76de607120d44416019fdf07
Parent:     71617bf140fd5a35645527502cd330f84045d40c
Author:     Michael Opdenacker <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:33:18 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:33:18 2008 +0100

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 arch/x86/kernel/Makefile |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index c414c45..5bdb0f0 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
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to