diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 01:47:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 01:47:47 -0400 |
| commit | 93022136fff9e6130aa128a5ed8a599e93ac813c (patch) | |
| tree | 185390fb75a3d7423cc508610b76637c957205b9 /arch/x86/kernel/Makefile | |
| parent | c49c412a47b5102516d3313d4eba38cb1e968721 (diff) | |
| parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) | |
Merge commit 'v2.6.26-rc9' into x86/cpu
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 4934fec38c42..3a2a54c950ff 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -81,6 +81,7 @@ obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o | |||
| 81 | obj-$(CONFIG_KVM_GUEST) += kvm.o | 81 | obj-$(CONFIG_KVM_GUEST) += kvm.o |
| 82 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o | 82 | obj-$(CONFIG_KVM_CLOCK) += kvmclock.o |
| 83 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o | 83 | obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o |
| 84 | obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o | ||
| 84 | 85 | ||
| 85 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o | 86 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o |
| 86 | 87 | ||