diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:20:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 18:20:40 -0500 |
commit | cce0cac125623f9b68f25dd1350f6d616220a8dd (patch) | |
tree | 123a4dd9f040d05e42cadb6b01f301d6863b897f /arch/arm/mach-ixp2000/ixdp2400.c | |
parent | f564c5fe29d3fa9adc6d839714521b0554c62598 (diff) | |
parent | 18f49ea207fbcf37f81395037f0dc1cacb2aac3c (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Manual conflict merge of arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2400.c')
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2400.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index 7c782403042a..09101271298e 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c | |||
@@ -68,6 +68,7 @@ void __init ixdp2400_pci_preinit(void) | |||
68 | { | 68 | { |
69 | ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00100000); | 69 | ixp2000_reg_write(IXP2000_PCI_ADDR_EXT, 0x00100000); |
70 | ixp2000_pci_preinit(); | 70 | ixp2000_pci_preinit(); |
71 | pcibios_setup("firmware"); | ||
71 | } | 72 | } |
72 | 73 | ||
73 | int ixdp2400_pci_setup(int nr, struct pci_sys_data *sys) | 74 | int ixdp2400_pci_setup(int nr, struct pci_sys_data *sys) |