diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-05-04 12:58:54 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-05-12 11:46:56 -0400 |
commit | b01273f120a390363ceb27bd0ccc60ddf1fb936d (patch) | |
tree | 49774db21dcf89fcf29ea0e47d600eaf75503886 | |
parent | d303f4a1a09b18e9689aa896bbc23879130b1da8 (diff) |
[MIPS] markeins: build fix
This patch fixes the following build errror caused by
commit 7dffa3c673fbcf835cd7be80bb4aec8ad3f51168
(ntp: handle leap second via timer):
<-- snip -->
...
CC arch/mips/emma2rh/markeins/setup.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/emma2rh/markeins/setup.c:79: error: conflicting types for 'clock'
/home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/clocksource.h:96: error: previous declaration of 'clock' was here
make[2]: *** [arch/mips/emma2rh/markeins/setup.o] Error 1
<-- snip -->
[Ralf: reformated to 80 colums after the fix and marked emma2rh_clock as
__initdata]
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-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 82f9e9013e70..62bfb455d1b1 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) | |||
76 | while (1) ; | 76 | while (1) ; |
77 | } | 77 | } |
78 | 78 | ||
79 | static unsigned long clock[4] = { 166500000, 187312500, 199800000, 210600000 }; | 79 | static unsigned long __initdata emma2rh_clock[4] = { |
80 | 166500000, 187312500, 199800000, 210600000 | ||
81 | }; | ||
80 | 82 | ||
81 | static unsigned int __init detect_bus_frequency(unsigned long rtc_base) | 83 | static unsigned int __init detect_bus_frequency(unsigned long rtc_base) |
82 | { | 84 | { |
@@ -85,7 +87,8 @@ static unsigned int __init detect_bus_frequency(unsigned long rtc_base) | |||
85 | /* detect from boot strap */ | 87 | /* detect from boot strap */ |
86 | reg = emma2rh_in32(EMMA2RH_BHIF_STRAP_0); | 88 | reg = emma2rh_in32(EMMA2RH_BHIF_STRAP_0); |
87 | reg = (reg >> 4) & 0x3; | 89 | reg = (reg >> 4) & 0x3; |
88 | return clock[reg]; | 90 | |
91 | return emma2rh_clock[reg]; | ||
89 | } | 92 | } |
90 | 93 | ||
91 | void __init plat_time_init(void) | 94 | void __init plat_time_init(void) |