aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/pci-nanoengine.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-sa1100/pci-nanoengine.c')
-rw-r--r--arch/arm/mach-sa1100/pci-nanoengine.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/pci-nanoengine.c b/arch/arm/mach-sa1100/pci-nanoengine.c
index fba7a913f12..dd39fee5954 100644
--- a/arch/arm/mach-sa1100/pci-nanoengine.c
+++ b/arch/arm/mach-sa1100/pci-nanoengine.c
@@ -28,6 +28,7 @@
28#include <asm/mach-types.h> 28#include <asm/mach-types.h>
29 29
30#include <mach/nanoengine.h> 30#include <mach/nanoengine.h>
31#include <mach/hardware.h>
31 32
32static DEFINE_SPINLOCK(nano_lock); 33static DEFINE_SPINLOCK(nano_lock);
33 34
@@ -122,7 +123,8 @@ static struct pci_ops pci_nano_ops = {
122 .write = nanoengine_write_config, 123 .write = nanoengine_write_config,
123}; 124};
124 125
125static int __init pci_nanoengine_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 126static int __init pci_nanoengine_map_irq(const struct pci_dev *dev, u8 slot,
127 u8 pin)
126{ 128{
127 return NANOENGINE_IRQ_GPIO_PCI; 129 return NANOENGINE_IRQ_GPIO_PCI;
128} 130}
@@ -252,6 +254,9 @@ int __init pci_nanoengine_setup(int nr, struct pci_sys_data *sys)
252{ 254{
253 int ret = 0; 255 int ret = 0;
254 256
257 pcibios_min_io = 0;
258 pcibios_min_mem = 0;
259
255 if (nr == 0) { 260 if (nr == 0) {
256 sys->mem_offset = NANO_PCI_MEM_RW_PHYS; 261 sys->mem_offset = NANO_PCI_MEM_RW_PHYS;
257 sys->io_offset = 0x400; 262 sys->io_offset = 0x400;