• Adrian Bunk's avatar
    [MIPS] markeins: build fix · b01273f1
    Adrian Bunk authored
    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: default avatarAdrian Bunk <bunk@kernel.org>
    Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
    b01273f1
setup.c 3.88 KB