From e0b2b32d06dbecf039176f89e56aeb0cfe091639 Mon Sep 17 00:00:00 2001 From: Dmitri Vorobiev Date: Tue, 15 Jan 2008 00:27:46 +0300 Subject: [PATCH] --- yaml --- r: 75604 b: refs/heads/master c: 0487de91427925e7c43debeb948bdf53b10ef32c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/mips-boards/malta/malta_setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 510fd28ff522..62e8dbd343da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2a04c4f0e1b09b58d7279e2facd306c40583ec1 +refs/heads/master: 0487de91427925e7c43debeb948bdf53b10ef32c diff --git a/trunk/arch/mips/mips-boards/malta/malta_setup.c b/trunk/arch/mips/mips-boards/malta/malta_setup.c index 9a2636e56243..bc43a5c2224d 100644 --- a/trunk/arch/mips/mips-boards/malta/malta_setup.c +++ b/trunk/arch/mips/mips-boards/malta/malta_setup.c @@ -149,7 +149,7 @@ void __init plat_mem_setup(void) /* Check PCI clock */ { unsigned int __iomem *jmpr_p = (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int)); - int jmpr = (readw(jmpr_p) >> 2) & 0x07; + int jmpr = (__raw_readl(jmpr_p) >> 2) & 0x07; static const int pciclocks[] __initdata = { 33, 20, 25, 30, 12, 16, 37, 10 };