git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-footbridge
/
isa-timer.c
diff --git
a/arch/arm/mach-footbridge/isa-timer.c
b/arch/arm/mach-footbridge/isa-timer.c
index 0c8390082fa8a49ef23c02071d7373c3d299c7d0..f488fa2082d76c07e51c890bb81856cb69b1618f 100644
(file)
--- 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 = {
static void __init isa_timer_init(void)
{
- isa_rtc_init();
-
/* enable PIT timer */
/* set for periodic (4) and LSB/MSB write (0x30) */
outb(0x34, 0x43);