---

yaml --- r: 118591 b: refs/heads/master c: 6a2d26f h: refs/heads/master i: 118589: e292921 118587: d14bbdd 118583: 3c997b6 118575: 0590317 118559: 5fa41af 118527: 99e8964 v: v3
git-mirror · Nov 4, 2008 · 261e0d0 · 261e0d0
1 parent a63ef5f
commit 261e0d0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9979aa7778e664bb31efb4281a9e118a9909c35c
+refs/heads/master: 6a2d26fd3fd1129824ffe53778832f0794d99cc2
diff --git a/trunk/arch/ia64/kernel/pci-dma.c b/trunk/arch/ia64/kernel/pci-dma.c
@@ -12,13 +12,11 @@
 #include <asm/machvec.h>
 #include <linux/dma-mapping.h>
 
-#include <asm/machvec.h>
 #include <asm/system.h>
 
 #ifdef CONFIG_DMAR
 
 #include <linux/kernel.h>
-#include <linux/string.h>
 
 #include <asm/page.h>
 #include <asm/iommu.h>