[MIPS] markeins: build fix
authorAdrian Bunk <bunk@kernel.org>
Sun, 4 May 2008 16:58:54 +0000 (19:58 +0300)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 12 May 2008 15:46:56 +0000 (16:46 +0100)
commitb01273f120a390363ceb27bd0ccc60ddf1fb936d
tree49774db21dcf89fcf29ea0e47d600eaf75503886
parentd303f4a1a09b18e9689aa896bbc23879130b1da8
[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>
arch/mips/emma2rh/markeins/setup.c