aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-sa1100/pci-nanoengine.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/pci-nanoengine.c b/arch/arm/mach-sa1100/pci-nanoengine.c
index ff02e2da99f2..b704433c529c 100644
--- a/arch/arm/mach-sa1100/pci-nanoengine.c
+++ b/arch/arm/mach-sa1100/pci-nanoengine.c
@@ -33,12 +33,12 @@
33static DEFINE_SPINLOCK(nano_lock); 33static DEFINE_SPINLOCK(nano_lock);
34 34
35static int nanoengine_get_pci_address(struct pci_bus *bus, 35static int nanoengine_get_pci_address(struct pci_bus *bus,
36 unsigned int devfn, int where, unsigned long *address) 36 unsigned int devfn, int where, void __iomem **address)
37{ 37{
38 int ret = PCIBIOS_DEVICE_NOT_FOUND; 38 int ret = PCIBIOS_DEVICE_NOT_FOUND;
39 unsigned int busnr = bus->number; 39 unsigned int busnr = bus->number;
40 40
41 *address = NANO_PCI_CONFIG_SPACE_VIRT + 41 *address = (void __iomem *)NANO_PCI_CONFIG_SPACE_VIRT +
42 ((bus->number << 16) | (devfn << 8) | (where & ~3)); 42 ((bus->number << 16) | (devfn << 8) | (where & ~3));
43 43
44 ret = (busnr > 255 || devfn > 255 || where > 255) ? 44 ret = (busnr > 255 || devfn > 255 || where > 255) ?
@@ -51,7 +51,7 @@ static int nanoengine_read_config(struct pci_bus *bus, unsigned int devfn, int w
51 int size, u32 *val) 51 int size, u32 *val)
52{ 52{
53 int ret; 53 int ret;
54 unsigned long address; 54 void __iomem *address;
55 unsigned long flags; 55 unsigned long flags;
56 u32 v; 56 u32 v;
57 57
@@ -85,7 +85,7 @@ static int nanoengine_write_config(struct pci_bus *bus, unsigned int devfn, int
85 int size, u32 val) 85 int size, u32 val)
86{ 86{
87 int ret; 87 int ret;
88 unsigned long address; 88 void __iomem *address;
89 unsigned long flags; 89 unsigned long flags;
90 unsigned shift; 90 unsigned shift;
91 u32 v; 91 u32 v;