OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
71617bf
)
x86: fix unconditional arch/x86/kernel/pcspeaker.o compiling
author
Michael Opdenacker
<michael-lists@free-electrons.com>
Wed, 30 Jan 2008 12:33:18 +0000
(13:33 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 30 Jan 2008 12:33:18 +0000
(13:33 +0100)
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>
arch/x86/kernel/Makefile
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/Makefile
b/arch/x86/kernel/Makefile
index
c414c45
..
5bdb0f0
100644
(file)
--- 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