diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /arch/arm/mach-footbridge/isa-timer.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/arm/mach-footbridge/isa-timer.c')
| -rw-r--r-- | arch/arm/mach-footbridge/isa-timer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c index 0c8390082fa8..f488fa2082d7 100644 --- a/arch/arm/mach-footbridge/isa-timer.c +++ b/arch/arm/mach-footbridge/isa-timer.c | |||
| @@ -76,8 +76,6 @@ static struct irqaction isa_timer_irq = { | |||
| 76 | 76 | ||
| 77 | static void __init isa_timer_init(void) | 77 | static void __init isa_timer_init(void) |
| 78 | { | 78 | { |
| 79 | isa_rtc_init(); | ||
| 80 | |||
| 81 | /* enable PIT timer */ | 79 | /* enable PIT timer */ |
| 82 | /* set for periodic (4) and LSB/MSB write (0x30) */ | 80 | /* set for periodic (4) and LSB/MSB write (0x30) */ |
| 83 | outb(0x34, 0x43); | 81 | outb(0x34, 0x43); |