diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-05-12 22:29:14 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-05-12 22:29:14 +0200 |
commit | 5aaca7a7a5db157530d195c4b93c8fc4682f8a48 (patch) | |
tree | 1c9a2a7e898c8a460bc10d7f3c5c8308188c0072 /arch/mips/emma2rh/markeins/setup.c | |
parent | 8c6b0ef2ea1bb42cd72d987389297f66cd25790b (diff) | |
parent | 9404ef02974a5411687b6c1b8ef3984305620e02 (diff) |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch/mips/emma2rh/markeins/setup.c')
-rw-r--r-- | arch/mips/emma2rh/markeins/setup.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c index 82f9e9013e7..62bfb455d1b 100644 --- a/arch/mips/emma2rh/markeins/setup.c +++ b/arch/mips/emma2rh/markeins/setup.c @@ -76,7 +76,9 @@ static void markeins_machine_power_off(void) while (1) ; } -static unsigned long clock[4] = { 166500000, 187312500, 199800000, 210600000 }; +static unsigned long __initdata emma2rh_clock[4] = { + 166500000, 187312500, 199800000, 210600000 +}; static unsigned int __init detect_bus_frequency(unsigned long rtc_base) { @@ -85,7 +87,8 @@ static unsigned int __init detect_bus_frequency(unsigned long rtc_base) /* detect from boot strap */ reg = emma2rh_in32(EMMA2RH_BHIF_STRAP_0); reg = (reg >> 4) & 0x3; - return clock[reg]; + + return emma2rh_clock[reg]; } void __init plat_time_init(void) |