Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

[mv-sheeva.git] / arch / mips / pci / ops-nile4.c

diff --git a/arch/mips/pci/ops-nile4.c b/arch/mips/pci/ops-nile4.c
index a8d38dc8c504c400ff05315df9dfd4d82e868cd4..b7f0fb0210f4ea691647e5e53494fcbef4a06c5b 100644 (file)
--- a/arch/mips/pci/ops-nile4.c
+++ b/arch/mips/pci/ops-nile4.c
@@ -18,7 +18,7 @@ volatile unsigned long *const vrc_pciregs = (void *) Vrc5074_BASE;
 static DEFINE_SPINLOCK(nile4_pci_lock);
 
 static int nile4_pcibios_config_access(unsigned char access_type,
-       struct pci_bus *bus, unsigned int devfn, int where, u32 * val)
+       struct pci_bus *bus, unsigned int devfn, int where, u32 *val)
 {
        unsigned char busnum = bus->number;
        u32 adr, mask, err;
@@ -76,7 +76,7 @@ static int nile4_pcibios_config_access(unsigned char access_type,
 }
 
 static int nile4_pcibios_read(struct pci_bus *bus, unsigned int devfn,
-       int where, int size, u32 * val)
+       int where, int size, u32 *val)
 {
        unsigned long flags;
        u32 data = 0;
@@ -119,7 +119,7 @@ static int nile4_pcibios_write(struct pci_bus *bus, unsigned int devfn,
 
        spin_lock_irqsave(&nile4_pci_lock, flags);
        err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where,
-                                         &data);
+                                         &data);
        spin_unlock_irqrestore(&nile4_pci_lock, flags);
 
        if (err)