diff options
| author | Michael Opdenacker <michael-lists@free-electrons.com> | 2008-01-30 07:33:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:18 -0500 |
| commit | 67926892ef7a7fbc76de607120d44416019fdf07 (patch) | |
| tree | cf7c68c65d80e723788e69b27e321230d1c4ddd2 | |
| parent | 71617bf140fd5a35645527502cd330f84045d40c (diff) | |
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>
| -rw-r--r-- | 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 c414c45a0f13..5bdb0f0431e9 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 | |||
| 67 | 67 | ||
| 68 | obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o | 68 | obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o |
| 69 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o | 69 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o |
| 70 | |||
| 71 | ifdef CONFIG_INPUT_PCSPKR | ||
| 70 | obj-y += pcspeaker.o | 72 | obj-y += pcspeaker.o |
| 73 | endif | ||
| 71 | 74 | ||
| 72 | obj-$(CONFIG_SCx200) += scx200_32.o | 75 | obj-$(CONFIG_SCx200) += scx200_32.o |
| 73 | 76 | ||