From ec6156e227ba22832d27f83eef30c47303001819 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 16 Mar 2012 17:48:29 -0600
Subject: [PATCH] --- yaml --- r: 294795 b: refs/heads/master c:
 bc4d7990d09dc066897493619ec3c90ad0285ead h: refs/heads/master i:   294793:
 fa8fd2751631167a2327b890ba7ec531131a601e   294791:
 8b2e0dd07c3b9fdcf6df1ca10999ded165ad5b21 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/unicore32/include/asm/pci.h | 1 +
 trunk/arch/unicore32/kernel/pci.c      | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a7b82d463923..c5b5dfb8fb4f 100644
--- 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
index dd3867727c35..f5e108f4a151 100644
--- 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
index 6c1248f5f56a..2fc2b1ba825e 100644
--- 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;