diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:05:39 -0400 |
| commit | a9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch) | |
| tree | 98304395fbb5b9c74fca35b196cd414c1949f280 /arch/arm/mach-iop13xx/include/mach/pci.h | |
| parent | a8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/arm/mach-iop13xx/include/mach/pci.h')
| -rw-r--r-- | arch/arm/mach-iop13xx/include/mach/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/include/mach/pci.h b/arch/arm/mach-iop13xx/include/mach/pci.h index 17b5515af8b1..59f42b535572 100644 --- a/arch/arm/mach-iop13xx/include/mach/pci.h +++ b/arch/arm/mach-iop13xx/include/mach/pci.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #ifndef _IOP13XX_PCI_H_ | 1 | #ifndef _IOP13XX_PCI_H_ |
| 2 | #define _IOP13XX_PCI_H_ | 2 | #define _IOP13XX_PCI_H_ |
| 3 | #include <linux/io.h> | ||
| 3 | #include <mach/irqs.h> | 4 | #include <mach/irqs.h> |
| 4 | #include <asm/io.h> | ||
| 5 | 5 | ||
| 6 | struct pci_sys_data; | 6 | struct pci_sys_data; |
| 7 | struct hw_pci; | 7 | struct hw_pci; |