diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /arch/arm/mach-footbridge/isa-timer.c | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
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); |