From 4e649fd7896b895f2515321c95e0dd7891747cac Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Wed, 17 Oct 2007 18:04:35 +0200
Subject: [PATCH] --- yaml --- r: 70968 b: refs/heads/master c:
 17d1486a69657a3de1482d1bd4882c3ce1d9cf1e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 346d4e1ad3a7..47e143b9a5f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 231b64bfee050b3b3fd91c629b653fecdfe7b7bf
+refs/heads/master: 17d1486a69657a3de1482d1bd4882c3ce1d9cf1e
diff --git a/trunk/arch/x86/kernel/pci-dma_32.c b/trunk/arch/x86/kernel/pci-dma_32.c
index 0aae2f3847a5..51330321a5d3 100644
--- a/trunk/arch/x86/kernel/pci-dma_32.c
+++ b/trunk/arch/x86/kernel/pci-dma_32.c
@@ -12,7 +12,6 @@
 #include <linux/string.h>
 #include <linux/pci.h>
 #include <linux/module.h>
-#include <linux/pci.h>
 #include <asm/io.h>
 
 struct dma_coherent_mem {