---

yaml --- r: 294795 b: refs/heads/master c: bc4d799 h: refs/heads/master i: 294793: fa8fd27 294791: 8b2e0dd v: v3
git-mirror · Mar 20, 2012 · ec6156e · ec6156e
1 parent a16f868
commit ec6156e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a031589bc04086250d0a4d89dd277a70d74ed8fa
+refs/heads/master: bc4d7990d09dc066897493619ec3c90ad0285ead
diff --git a/trunk/arch/unicore32/include/asm/pci.h b/trunk/arch/unicore32/include/asm/pci.h
@@ -14,6 +14,7 @@
 
 #ifdef __KERNEL__
 #include <asm-generic/pci-dma-compat.h>
+#include <asm-generic/pci-bridge.h>
 #include <asm-generic/pci.h>
 #include <mach/hardware.h> /* for PCIBIOS_MIN_* */
 

diff --git a/trunk/arch/unicore32/kernel/pci.c b/trunk/arch/unicore32/kernel/pci.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <asm-generic/pci-bridge.h>
 
 static int debug_pci;