summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2007-10-24 12:49:48 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-30 00:22:22 +0100
commit966396d3a05c8049fce5c81c49138e5ee1b05443 (patch)
tree11fff010a4aecd965bed52719d55d8fa4b40b055 /drivers/usb/core
parent395624fcddd178de01a78aa88670a86ec919de77 (diff)
downloadblackbird-op-linux-966396d3a05c8049fce5c81c49138e5ee1b05443.tar.gz
blackbird-op-linux-966396d3a05c8049fce5c81c49138e5ee1b05443.zip
x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU
This patch renames the IOMMU config option to GART_IOMMU because in fact it means the GART and not general support for an IOMMU on x86. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Acked-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index eb4ac47612a5..316a746e0080 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -434,7 +434,7 @@ int usb_sg_init (
if (dma) {
io->urbs [i]->transfer_dma = sg_dma_address (sg + i);
len = sg_dma_len (sg + i);
-#if defined(CONFIG_HIGHMEM) || defined(CONFIG_IOMMU)
+#if defined(CONFIG_HIGHMEM) || defined(CONFIG_GART_IOMMU)
io->urbs[i]->transfer_buffer = NULL;
#else
io->urbs[i]->transfer_buffer = sg_virt(&sg[i]);
OpenPOWER on IntegriCloud