diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:18:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 13:18:06 -0700 |
commit | d60a2793ba562c6ea9bbf62112da3e6342adcf83 (patch) | |
tree | 22a16cea2838fd473d03e8c6c64b93f0e3519f33 /arch/x86/kernel/Makefile | |
parent | 781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9 (diff) | |
parent | 40ffa93791985ab300fd488072e9f37ccf72e88c (diff) | |
download | kernel_samsung_smdk4412-d60a2793ba562c6ea9bbf62112da3e6342adcf83.zip kernel_samsung_smdk4412-d60a2793ba562c6ea9bbf62112da3e6342adcf83.tar.gz kernel_samsung_smdk4412-d60a2793ba562c6ea9bbf62112da3e6342adcf83.tar.bz2 |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Remove stale pmtimer_64.c
x86, cleanups: Use clear_page/copy_page rather than memset/memcpy
x86: Remove unnecessary #ifdef ACPI/X86_IO_ACPI
x86, cleanup: Remove obsolete boot_cpu_id variable
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 81f3770..f49257e 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -123,7 +123,6 @@ obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o # 64 bit specific files ifeq ($(CONFIG_X86_64),y) obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o - obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o obj-$(CONFIG_AUDIT) += audit_64.o obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o |