diff options
Diffstat (limited to 'arch/arm/plat-iop/pci.c')
-rw-r--r-- | arch/arm/plat-iop/pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index e2744b7227c5..2b5aa1135b11 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/signal.h> | ||
22 | #include <asm/system.h> | 23 | #include <asm/system.h> |
23 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
24 | #include <asm/mach/pci.h> | 25 | #include <asm/mach/pci.h> |
@@ -85,10 +86,10 @@ static int iop3xx_pci_status(void) | |||
85 | 86 | ||
86 | /* | 87 | /* |
87 | * Simply write the address register and read the configuration | 88 | * Simply write the address register and read the configuration |
88 | * data. Note that the 4 nop's ensure that we are able to handle | 89 | * data. Note that the 4 nops ensure that we are able to handle |
89 | * a delayed abort (in theory.) | 90 | * a delayed abort (in theory.) |
90 | */ | 91 | */ |
91 | static inline u32 iop3xx_read(unsigned long addr) | 92 | static u32 iop3xx_read(unsigned long addr) |
92 | { | 93 | { |
93 | u32 val; | 94 | u32 val; |
94 | 95 | ||
@@ -321,7 +322,7 @@ void __init iop3xx_atu_disable(void) | |||
321 | /* Flag to determine whether the ATU is initialized and the PCI bus scanned */ | 322 | /* Flag to determine whether the ATU is initialized and the PCI bus scanned */ |
322 | int init_atu; | 323 | int init_atu; |
323 | 324 | ||
324 | void iop3xx_pci_preinit(void) | 325 | void __init iop3xx_pci_preinit(void) |
325 | { | 326 | { |
326 | if (iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE) { | 327 | if (iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE) { |
327 | iop3xx_atu_disable(); | 328 | iop3xx_atu_disable(); |