lkml.org 
[lkml]   [2008]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[2.6 patch] mips/emma2rh/markeins/setup.c 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 -->

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---

arch/mips/emma2rh/markeins/setup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

139244b9f3cd31793da682da14c67e38836bec36 diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c
index 82f9e90..487cac5 100644
--- a/arch/mips/emma2rh/markeins/setup.c
+++ b/arch/mips/emma2rh/markeins/setup.c
@@ -76,7 +76,7 @@ static void markeins_machine_power_off(void)
while (1) ;
}

-static unsigned long clock[4] = { 166500000, 187312500, 199800000, 210600000 };
+static unsigned long emma2rh_clock[4] = { 166500000, 187312500, 199800000, 210600000 };

static unsigned int __init detect_bus_frequency(unsigned long rtc_base)
{
@@ -85,7 +85,7 @@ 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)


\
 
 \ /
  Last update: 2008-05-04 19:03    [W:0.029 / U:53.432 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site