diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-24 07:52:44 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-24 08:39:18 -0500 |
commit | 382b4480ff832e472d76c99f3f75fffb30e118c0 (patch) | |
tree | caddb10180a24cda8b0ed280688dde14dcb7232e /arch/arm/mach-footbridge/dc21285-timer.c | |
parent | 6dc995a3da9adfa83d61ccf06aa1afa5f6ab764f (diff) |
ARM: footbridge: trim down old ISA rtc setup
This fixes a "start_kernel(): bug: interrupts were enabled early".
rtc_cmos now takes care of initializing the ISA RTC and reading the
current time and date from it; there's no need to repeat that here,
thereby causing interrupts to be enabled too early.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-footbridge/dc21285-timer.c')
-rw-r--r-- | arch/arm/mach-footbridge/dc21285-timer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index da35bc5c5ccc..bc5e83fb5819 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c | |||
@@ -56,8 +56,6 @@ static void __init footbridge_timer_init(void) | |||
56 | *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD | TIMER_CNTL_DIV16; | 56 | *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD | TIMER_CNTL_DIV16; |
57 | 57 | ||
58 | setup_irq(IRQ_TIMER1, &footbridge_timer_irq); | 58 | setup_irq(IRQ_TIMER1, &footbridge_timer_irq); |
59 | |||
60 | isa_rtc_init(); | ||
61 | } | 59 | } |
62 | 60 | ||
63 | struct sys_timer footbridge_timer = { | 61 | struct sys_timer footbridge_timer = { |