From 261e0d05460d3f1dfa0465b4d2ae75a41546db8b Mon Sep 17 00:00:00 2001
From: Huang Weiyi <weiyi.huang@gmail.com>
Date: Sun, 26 Oct 2008 23:09:19 +0800
Subject: [PATCH] --- yaml --- r: 118591 b: refs/heads/master c:
 6a2d26fd3fd1129824ffe53778832f0794d99cc2 h: refs/heads/master i:   118589:
 e292921f24ff0411b3b7f2d7a81346c4e312a816   118587:
 d14bbdd07b626516259ae31123acce3f5ae13046   118583:
 3c997b6b253544999a818835ea306d7ca9672779   118575:
 0590317d3fa0e9643aea40e1eb6fe195a1c86da3   118559:
 5fa41af238bc076f06e727edcd5eff0ca7df73e4   118527:
 99e89641813479b9b13b92c8b9aa87e01224e511 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/pci-dma.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2e59647d3bdd..5d8791d13e7b 100644
--- 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
index 031abbf9c875..dbdb778efa05 100644
--- 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>