summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-03-16 17:48:29 -0600
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-03-20 10:42:03 -0700
commitbc4d7990d09dc066897493619ec3c90ad0285ead (patch)
treea40be60d5c218bdcf287f888a45800646a39e7ac
parenta031589bc04086250d0a4d89dd277a70d74ed8fa (diff)
downloadlinux-3.10-bc4d7990d09dc066897493619ec3c90ad0285ead.tar.gz
linux-3.10-bc4d7990d09dc066897493619ec3c90ad0285ead.tar.bz2
linux-3.10-bc4d7990d09dc066897493619ec3c90ad0285ead.zip
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>
-rw-r--r--arch/unicore32/include/asm/pci.h1
-rw-r--r--arch/unicore32/kernel/pci.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h
index dd3867727c3..f5e108f4a15 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 6c1248f5f56..2fc2b1ba825 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;