projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] Fix bcm1480 compile
[powerpc.git]
/
arch
/
mips
/
sibyte
/
swarm
/
setup.c
diff --git
a/arch/mips/sibyte/swarm/setup.c
b/arch/mips/sibyte/swarm/setup.c
index
b661d24
..
f9e6949
100644
(file)
--- a/
arch/mips/sibyte/swarm/setup.c
+++ b/
arch/mips/sibyte/swarm/setup.c
@@
-72,8
+72,10
@@
const char *get_system_type(void)
void __init swarm_time_init(void)
{
void __init swarm_time_init(void)
{
+#if defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
/* Setup HPT */
sb1250_hpt_setup();
/* Setup HPT */
sb1250_hpt_setup();
+#endif
}
void __init swarm_timer_setup(struct irqaction *irq)
}
void __init swarm_timer_setup(struct irqaction *irq)
@@
-103,7
+105,7
@@
int swarm_be_handler(struct pt_regs *regs, int is_fixup)
return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
}
return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
}
-void __init plat_setup(void)
+void __init plat_
mem_
setup(void)
{
#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
bcm1480_setup();
{
#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
bcm1480_setup();
@@
-121,14
+123,14
@@
void __init plat_setup(void)
if (xicor_probe()) {
printk("swarm setup: Xicor 1241 RTC detected.\n");
if (xicor_probe()) {
printk("swarm setup: Xicor 1241 RTC detected.\n");
- rtc_get_time = xicor_get_time;
- rtc_set_time = xicor_set_time;
+ rtc_
mips_
get_time = xicor_get_time;
+ rtc_
mips_
set_time = xicor_set_time;
}
if (m41t81_probe()) {
printk("swarm setup: M41T81 RTC detected.\n");
}
if (m41t81_probe()) {
printk("swarm setup: M41T81 RTC detected.\n");
- rtc_get_time = m41t81_get_time;
- rtc_set_time = m41t81_set_time;
+ rtc_
mips_
get_time = m41t81_get_time;
+ rtc_
mips_
set_time = m41t81_set_time;
}
printk("This kernel optimized for "
}
printk("This kernel optimized for "