aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/Makefile
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-06-26 13:57:22 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 10:48:17 -0700
commita813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7 (patch)
tree377a1aeb76547faf06ecd93b9da9b4c90817b2d4 /arch/x86_64/kernel/Makefile
parent4d9bc79cd28b779610d9590b3a96a28a0f64a25a (diff)
downloadkernel_samsung_smdk4412-a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7.zip
kernel_samsung_smdk4412-a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7.tar.gz
kernel_samsung_smdk4412-a813ce432f27c4f5011c7b5ac9d2bbbfeb41d9a7.tar.bz2
[PATCH] x86_64: Rename IOMMU option, fix help and mark option embedded.
- Rename the GART_IOMMU option to IOMMU to make clear it's not just for AMD - Rewrite the help text to better emphatise this fact - Make it an embedded option because too many people get it wrong. To my astonishment I discovered the aacraid driver tests this symbol directly. This looks quite broken to me - it's an internal implementation detail of the PCI DMA API. Can the maintainer please clarify what this test was intended to do? Cc: linux-scsi@vger.kernel.org Cc: alan@redhat.com Cc: markh@osdl.org Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/Makefile')
-rw-r--r--arch/x86_64/kernel/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index f927d11..fd106bd 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_PM) += suspend.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
-obj-$(CONFIG_GART_IOMMU) += pci-gart.o aperture.o
+obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o
obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
obj-$(CONFIG_KPROBES) += kprobes.o
obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o