git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
mips
/
ite-boards
/
generic
/
time.c
diff --git
a/arch/mips/ite-boards/generic/time.c
b/arch/mips/ite-boards/generic/time.c
index
f5d67ee
..
3dc5556
100644
(file)
--- a/
arch/mips/ite-boards/generic/time.c
+++ b/
arch/mips/ite-boards/generic/time.c
@@
-29,6
+29,7
@@
#include <linux/sched.h>
#include <linux/time.h>
#include <linux/spinlock.h>
#include <linux/sched.h>
#include <linux/time.h>
#include <linux/spinlock.h>
+#include <linux/mc146818rtc.h>
#include <asm/time.h>
#include <asm/mipsregs.h>
#include <asm/time.h>
#include <asm/mipsregs.h>
@@
-227,12
+228,13
@@
void __init it8172_time_init(void)
local_irq_restore(flags);
local_irq_restore(flags);
- rtc_get_time = it8172_rtc_get_time;
- rtc_set_time = it8172_rtc_set_time;
+ rtc_
mips_
get_time = it8172_rtc_get_time;
+ rtc_
mips_
set_time = it8172_rtc_set_time;
}
#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
}
#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
-void __init it8172_timer_setup(struct irqaction *irq)
+
+void __init plat_timer_setup(struct irqaction *irq)
{
puts("timer_setup\n");
put32(NR_IRQS);
{
puts("timer_setup\n");
put32(NR_IRQS);