diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-04-26 10:46:24 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-04-27 11:20:24 -0400 |
commit | f197465384bf7ef1af184c2ed1a4e268911a91e3 (patch) | |
tree | d5637a3bff89aded9248bdf1cb24230d094d0228 /arch/mips/mips-boards/malta/malta_setup.c | |
parent | 78709b9df35346965b214e0e548412748d147776 (diff) |
[MIPS] MIPS Tech: Get rid of volatile in core code.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mips-boards/malta/malta_setup.c')
-rw-r--r-- | arch/mips/mips-boards/malta/malta_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index 56ea76679cd4..7873932532a1 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c | |||
@@ -145,7 +145,8 @@ void __init plat_mem_setup(void) | |||
145 | #ifdef CONFIG_BLK_DEV_IDE | 145 | #ifdef CONFIG_BLK_DEV_IDE |
146 | /* Check PCI clock */ | 146 | /* Check PCI clock */ |
147 | { | 147 | { |
148 | int jmpr = (*((volatile unsigned int *)ioremap(MALTA_JMPRS_REG, sizeof(unsigned int))) >> 2) & 0x07; | 148 | unsigned int __iomem *jmpr_p = (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int)); |
149 | int jmpr = (readw(jmpr_p) >> 2) & 0x07; | ||
149 | static const int pciclocks[] __initdata = { | 150 | static const int pciclocks[] __initdata = { |
150 | 33, 20, 25, 30, 12, 16, 37, 10 | 151 | 33, 20, 25, 30, 12, 16, 37, 10 |
151 | }; | 152 | }; |
@@ -179,7 +180,6 @@ void __init plat_mem_setup(void) | |||
179 | }; | 180 | }; |
180 | #endif | 181 | #endif |
181 | #endif | 182 | #endif |
182 | |||
183 | mips_reboot_setup(); | 183 | mips_reboot_setup(); |
184 | 184 | ||
185 | board_time_init = mips_time_init; | 185 | board_time_init = mips_time_init; |