Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits)
  [MIPS] Make timer interrupt frequency configurable from kconfig.
  [MIPS] Correct HAL2 Kconfig description
  [MIPS] Fix R4K cache macro names
  [MIPS] Add Missing R4K Cache Macros to IP27 & IP32
  [MIPS] Support for the RM9000-based Basler eXcite smart camera platform.
  [MIPS] Support for the R5500-based NEC EMMA2RH Mark-eins board
  [MIPS] Support SNI RM200C SNI in big endian mode and R5000 processors.
  [MIPS] SN: include asm/sn/types.h for nasid_t.
  [MIPS] Random fixes for sb1250
  [MIPS] Fix bcm1480 compile
  [MIPS] Remove support for NEC DDB5476.
  [MIPS] Remove support for NEC DDB5074.
  [MIPS] Cleanup memory managment initialization.
  [MIPS] SN: Declare bridge_pci_ops.
  [MIPS] Remove unused function alloc_pci_controller.
  [MIPS] IP27: Extract pci_ops into separate file.
  [MIPS] IP27: Use symbolic constants instead of magic numbers.
  [MIPS] vr41xx: remove unnecessay items from vr41xx/Kconfig.
  [MIPS] IP27: Cleanup N/M mode configuration.
  [MIPS] IP27: Throw away old unused hacks.
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/mips/pci/ops-sni.c b/arch/mips/pci/ops-sni.c
index 62bdd19c7f8e..2b0ccd6d9dcd 100644
--- a/arch/mips/pci/ops-sni.c
+++ b/arch/mips/pci/ops-sni.c
@@ -47,13 +47,13 @@ static int pcimt_read(struct pci_bus *bus, unsigned int devfn, int reg,
 
         switch (size) {
         case 1:
-                *val = *(volatile  u8 *) (PCIMT_CONFIG_DATA + (reg & 3));
+                *val = inb(PCIMT_CONFIG_DATA + (reg & 3));
                 break;
         case 2:
-                *val = *(volatile u16 *) (PCIMT_CONFIG_DATA + (reg & 2));
+                *val = inw(PCIMT_CONFIG_DATA + (reg & 2));
                 break;
         case 4:
-                *val = *(volatile u32 *) PCIMT_CONFIG_DATA;
+                *val = inl(PCIMT_CONFIG_DATA);
                 break;
         }
 
@@ -70,13 +70,13 @@ static int pcimt_write(struct pci_bus *bus, unsigned int devfn, int reg,
 
         switch (size) {
         case 1:
-                *(volatile  u8 *) (PCIMT_CONFIG_DATA + (reg & 3)) = val;
+                outb (val, PCIMT_CONFIG_DATA + (reg & 3));
                 break;
         case 2:
-                *(volatile u16 *) (PCIMT_CONFIG_DATA + (reg & 2)) = val;
+                outw (val, PCIMT_CONFIG_DATA + (reg & 2));
                 break;
         case 4:
-                *(volatile u32 *) PCIMT_CONFIG_DATA = val;
+                outl (val, PCIMT_CONFIG_DATA);
                 break;
         }