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
/
momentum
/
ocelot_c
/
setup.c
diff --git
a/arch/mips/momentum/ocelot_c/setup.c
b/arch/mips/momentum/ocelot_c/setup.c
index
a3e6f55
..
36f570e
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/setup.c
+++ b/
arch/mips/momentum/ocelot_c/setup.c
@@
-40,7
+40,6
@@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
* 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
-#include <linux/config.h>
#include <linux/bcd.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/bcd.h>
#include <linux/init.h>
#include <linux/kernel.h>
@@
-210,7
+209,7
@@
int m48t37y_set_time(unsigned long sec)
return 0;
}
return 0;
}
-void
momenco
_timer_setup(struct irqaction *irq)
+void
__init plat
_timer_setup(struct irqaction *irq)
{
setup_irq(7, irq);
}
{
setup_irq(7, irq);
}
@@
-225,13
+224,12
@@
void momenco_time_init(void)
#error Unknown CPU for this board
#endif
printk("momenco_time_init cpu_clock=%d\n", cpu_clock);
#error Unknown CPU for this board
#endif
printk("momenco_time_init cpu_clock=%d\n", cpu_clock);
- board_timer_setup = momenco_timer_setup;
rtc_mips_get_time = m48t37y_get_time;
rtc_mips_set_time = m48t37y_set_time;
}
rtc_mips_get_time = m48t37y_get_time;
rtc_mips_set_time = m48t37y_set_time;
}
-void __init plat_setup(void)
+void __init plat_
mem_
setup(void)
{
unsigned int tmpword;
{
unsigned int tmpword;
@@
-242,8
+240,8
@@
void __init plat_setup(void)
pm_power_off = momenco_ocelot_power_off;
/*
pm_power_off = momenco_ocelot_power_off;
/*
- * initrd_start = (ulong)ocelot_initrd_start;
- * initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size;
+ * initrd_start = (u
nsigned
long)ocelot_initrd_start;
+ * initrd_end = (u
nsigned
long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
* initrd_below_start_ok = 1;
*/
* initrd_below_start_ok = 1;
*/