diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-03 02:36:15 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-03 02:36:15 (GMT) |
| commit | 3a7142371efdc95f4c5b5ffc188b18efdc4e64dd (patch) | |
| tree | 29f2fbc9b0932ebeeb85dad6b309c1a22f9b1026 /arch/x86_64 | |
| parent | ec1890c5df451799dec969a3581ff72e1934b5ee (diff) | |
| parent | c7fb577e2a6cb04732541f2dc402bd46747f7558 (diff) | |
| download | linux-fsl-qoriq-3a7142371efdc95f4c5b5ffc188b18efdc4e64dd.tar.xz | |
Merge branch 'swiotlb' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index bcdd0a8..14328ca 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -27,7 +27,6 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_GART_IOMMU) += pci-gart.o aperture.o obj-$(CONFIG_DUMMY_IOMMU) += pci-nommu.o pci-dma.o -obj-$(CONFIG_SWIOTLB) += swiotlb.o obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o @@ -41,7 +40,6 @@ CFLAGS_vsyscall.o := $(PROFILING) -g0 bootflag-y += ../../i386/kernel/bootflag.o cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o topology-y += ../../i386/mach-default/topology.o -swiotlb-$(CONFIG_SWIOTLB) += ../../ia64/lib/swiotlb.o microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o quirks-y += ../../i386/kernel/quirks.o |