Commit b01273f1 authored May 04, 2008 by Adrian Bunk Committed by Ralf Baechle May 12, 2008

[MIPS] markeins: build fix



This patch fixes the following build errror caused by
commit 7dffa3c6
(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>

parent d303f4a1

arch/mips/emma2rh/markeins/setup.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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)