From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 16 Mar 2012 23:48:29 +0000 (-0600)
Subject: unicore32/PCI: move <asm-generic/pci-bridge.h> include to asm/pci.h
X-Git-Tag: v3.4-rc1~114^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc4d7990d09dc066897493619ec3c90ad0285ead;p=thirdparty%2Fkernel%2Flinux.git

unicore32/PCI: move <asm-generic/pci-bridge.h> include to asm/pci.h

Move this include to be consistent with other architectures.

CC: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h
index dd3867727c352..f5e108f4a151a 100644
--- a/arch/unicore32/include/asm/pci.h
+++ b/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/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
index 6c1248f5f56a0..2fc2b1ba825e6 100644
--- a/arch/unicore32/kernel/pci.c
+++ b/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;