diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/mach-footbridge/dc21285-timer.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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 = { |