From b3a03e61b239c665fa787659cf3d694ad36ac234 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 5 Nov 2005 17:25:53 +0100
Subject: [PATCH] --- yaml --- r: 14198 b: refs/heads/master c:
 59170891049cc469777a392e0b3f5aa7aad784a6 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86_64/mm/init.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 803bccae34ee..de7785f5cdbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d74dbd79a571b31f7cd2c69bb5e44368972bf93
+refs/heads/master: 59170891049cc469777a392e0b3f5aa7aad784a6
diff --git a/trunk/arch/x86_64/mm/init.c b/trunk/arch/x86_64/mm/init.c
index 63f192cd7c1c..854a41b8372b 100644
--- a/trunk/arch/x86_64/mm/init.c
+++ b/trunk/arch/x86_64/mm/init.c
@@ -22,6 +22,7 @@
 #include <linux/pagemap.h>
 #include <linux/bootmem.h>
 #include <linux/proc_fs.h>
+#include <linux/pci.h>
 
 #include <asm/processor.h>
 #include <asm/system.h>
@@ -42,10 +43,6 @@
 #define Dprintk(x...)
 #endif
 
-#ifdef CONFIG_GART_IOMMU
-extern int swiotlb;
-#endif
-
 static unsigned long dma_reserve __initdata;
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);