git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
pmc-sierra
/
yosemite
/
setup.c
diff --git
a/arch/mips/pmc-sierra/yosemite/setup.c
b/arch/mips/pmc-sierra/yosemite/setup.c
index
3f724d6
..
0a6ee8e
100644
(file)
--- a/
arch/mips/pmc-sierra/yosemite/setup.c
+++ b/
arch/mips/pmc-sierra/yosemite/setup.c
@@
-133,14
+133,13
@@
int m48t37y_set_time(unsigned long sec)
return 0;
}
return 0;
}
-void
yosemite
_timer_setup(struct irqaction *irq)
+void
__init plat
_timer_setup(struct irqaction *irq)
{
setup_irq(7, irq);
}
void yosemite_time_init(void)
{
{
setup_irq(7, irq);
}
void yosemite_time_init(void)
{
- board_timer_setup = yosemite_timer_setup;
mips_hpt_frequency = cpu_clock / 2;
mips_hpt_frequency = 33000000 * 3 * 5;
}
mips_hpt_frequency = cpu_clock / 2;
mips_hpt_frequency = 33000000 * 3 * 5;
}
@@
-218,7
+217,7
@@
static void __init py_late_time_init(void)
py_rtc_setup();
}
py_rtc_setup();
}
-void __init plat_setup(void)
+void __init plat_
mem_
setup(void)
{
board_time_init = yosemite_time_init;
late_time_init = py_late_time_init;
{
board_time_init = yosemite_time_init;
late_time_init = py_late_time_init;