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
fedora core 6 1.2949 + vserver 2.2.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
8bce711
..
1b9b0d3
100644
(file)
--- a/
arch/mips/pmc-sierra/yosemite/setup.c
+++ b/
arch/mips/pmc-sierra/yosemite/setup.c
@@
-46,7
+46,6
@@
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/processor.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/processor.h>
-#include <asm/ptrace.h>
#include <asm/reboot.h>
#include <asm/serial.h>
#include <asm/titan_dep.h>
#include <asm/reboot.h>
#include <asm/serial.h>
#include <asm/titan_dep.h>
@@
-133,14
+132,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;
}
@@
-198,8
+196,8
@@
static void __init py_rtc_setup(void)
if (!m48t37_base)
printk(KERN_ERR "Mapping the RTC failed\n");
if (!m48t37_base)
printk(KERN_ERR "Mapping the RTC failed\n");
- rtc_get_time = m48t37y_get_time;
- rtc_set_time = m48t37y_set_time;
+ rtc_
mips_
get_time = m48t37y_get_time;
+ rtc_
mips_
set_time = m48t37y_set_time;
write_seqlock(&xtime_lock);
xtime.tv_sec = m48t37y_get_time();
write_seqlock(&xtime_lock);
xtime.tv_sec = m48t37y_get_time();
@@
-218,7
+216,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;