diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:53:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:53:24 -0700 |
commit | 709d9f54cc1847a2d24224ffedec7fd4d0f3c714 (patch) | |
tree | 28aa81a0f7425be438eb1a31e33a1d8ae90c0292 /arch/x86/kernel/Makefile | |
parent | cca8209ed962f87990345ba073979d2b55dd1187 (diff) | |
parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d (diff) | |
download | kernel_samsung_smdk4412-709d9f54cc1847a2d24224ffedec7fd4d0f3c714.zip kernel_samsung_smdk4412-709d9f54cc1847a2d24224ffedec7fd4d0f3c714.tar.gz kernel_samsung_smdk4412-709d9f54cc1847a2d24224ffedec7fd4d0f3c714.tar.bz2 |
Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, paravirt: Remove alloc_pmd_clone hook, only used by VMI
x86, vmware: Remove deprecated VMI kernel support
Fix up trivial #include conflict in arch/x86/kernel/smpboot.c
Diffstat (limited to 'arch/x86/kernel/Makefile')
-rw-r--r-- | arch/x86/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 3323c64..80a93dc 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -95,7 +95,6 @@ obj-$(CONFIG_AMD_NB) += amd_nb.o obj-$(CONFIG_DEBUG_RODATA_TEST) += test_rodata.o obj-$(CONFIG_DEBUG_NX_TEST) += test_nx.o -obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o obj-$(CONFIG_KVM_GUEST) += kvm.o obj-$(CONFIG_KVM_CLOCK) += kvmclock.o obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch_$(BITS).o |