A call to r4k_clocksource_init() was added to plat_time_init(), but when init_mips_clock_source() calls the same function, boot fails in clockevents_register_device(). This patch removes the extraneous call. Signed-off-by: David VomLehn <dvomlehn@cisco.com> Patchwork: http://patchwork.linux-mips.org/patch/803/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
		
			
				
	
	
		
			36 lines
		
	
	
	
		
			1.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			36 lines
		
	
	
	
		
			1.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Carsten Langgaard, carstenl@mips.com
 | 
						|
 * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
 | 
						|
 * Portions copyright (C) 2009 Cisco Systems, Inc.
 | 
						|
 *
 | 
						|
 *  This program is free software; you can distribute it and/or modify it
 | 
						|
 *  under the terms of the GNU General Public License (Version 2) as
 | 
						|
 *  published by the Free Software Foundation.
 | 
						|
 *
 | 
						|
 *  This program is distributed in the hope it will be useful, but WITHOUT
 | 
						|
 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 | 
						|
 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 | 
						|
 *  for more details.
 | 
						|
 *
 | 
						|
 *  You should have received a copy of the GNU General Public License along
 | 
						|
 *  with this program; if not, write to the Free Software Foundation, Inc.,
 | 
						|
 *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 | 
						|
 *
 | 
						|
 * Setting up the clock on the MIPS boards.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/init.h>
 | 
						|
#include <asm/mach-powertv/interrupts.h>
 | 
						|
#include <asm/time.h>
 | 
						|
 | 
						|
#include "powertv-clock.h"
 | 
						|
 | 
						|
unsigned int __cpuinit get_c0_compare_int(void)
 | 
						|
{
 | 
						|
	return irq_mips_timer;
 | 
						|
}
 | 
						|
 | 
						|
void __init plat_time_init(void)
 | 
						|
{
 | 
						|
	powertv_clocksource_init();
 | 
						|
}
 |