The following commit has been merged in the linux branch: commit accfd35a4e82148ff3d6e1946c1786e73fb408fd Author: Chris Dearman chris@mips.com Date: Fri Jul 10 01:53:54 2009 -0700

MIPS: MTI: Fix accesses to device registers on MIPS boards

This fixes the remaining problems introduced by f197465384bf7ef1af184c2ed1a4e268911a91e3 (incorrect access length & byteswapping in bigendian mode)

Signed-off-by: Chris Dearman chris@mips.com Signed-off-by: Ralf Baechle ralf@linux-mips.org

diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c index 3e0a9b3..e568d0d 100644 --- a/arch/mips/mti-malta/malta-int.c +++ b/arch/mips/mti-malta/malta-int.c @@ -87,7 +87,7 @@ static inline int mips_pcibios_iack(void) dummy = BONITO_PCIMAP_CFG; iob(); /* sync */

- irq = readl((u32 *)_pcictrl_bonito_pcicfg); + irq = __raw_readl((u32 *)_pcictrl_bonito_pcicfg); iob(); /* sync */ irq &= 0xff; BONITO_PCIMAP_CFG = 0;