diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /arch/arm/mach-integrator/pci_v3.c | |
| parent | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/arm/mach-integrator/pci_v3.c')
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index f9043592e299..4418f6d7572d 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c | |||
| @@ -600,4 +600,6 @@ void __init pci_v3_postinit(void) | |||
| 600 | printk(KERN_ERR "PCI: unable to grab local bus timeout " | 600 | printk(KERN_ERR "PCI: unable to grab local bus timeout " |
| 601 | "interrupt: %d\n", ret); | 601 | "interrupt: %d\n", ret); |
| 602 | #endif | 602 | #endif |
| 603 | |||
| 604 | register_isa_ports(PHYS_PCI_MEM_BASE, PHYS_PCI_IO_BASE, 0); | ||
| 603 | } | 605 | } |