diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-03-16 19:48:29 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-03-20 13:42:03 -0400 |
commit | bc4d7990d09dc066897493619ec3c90ad0285ead (patch) | |
tree | a40be60d5c218bdcf287f888a45800646a39e7ac /arch/unicore32 | |
parent | a031589bc04086250d0a4d89dd277a70d74ed8fa (diff) |
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>
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/include/asm/pci.h | 1 | ||||
-rw-r--r-- | arch/unicore32/kernel/pci.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h index dd3867727c35..f5e108f4a151 100644 --- a/arch/unicore32/include/asm/pci.h +++ b/arch/unicore32/include/asm/pci.h | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | #ifdef __KERNEL__ | 15 | #ifdef __KERNEL__ |
16 | #include <asm-generic/pci-dma-compat.h> | 16 | #include <asm-generic/pci-dma-compat.h> |
17 | #include <asm-generic/pci-bridge.h> | ||
17 | #include <asm-generic/pci.h> | 18 | #include <asm-generic/pci.h> |
18 | #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ | 19 | #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ |
19 | 20 | ||
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index 6c1248f5f56a..2fc2b1ba825e 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
22 | #include <asm-generic/pci-bridge.h> | ||
23 | 22 | ||
24 | static int debug_pci; | 23 | static int debug_pci; |
25 | 24 | ||