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
/
jaguar_atx
/
setup.c
diff --git
a/arch/mips/momentum/jaguar_atx/setup.c
b/arch/mips/momentum/jaguar_atx/setup.c
index
1379c76
..
e6fe299
100644
(file)
--- a/
arch/mips/momentum/jaguar_atx/setup.c
+++ b/
arch/mips/momentum/jaguar_atx/setup.c
@@
-39,7
+39,6
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 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>
@@
-213,7
+212,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(8, irq);
}
{
setup_irq(8, irq);
}
@@
-227,7
+226,6
@@
void momenco_time_init(void)
wire_stupidity_into_tlb();
mips_hpt_frequency = cpu_clock / 2;
wire_stupidity_into_tlb();
mips_hpt_frequency = cpu_clock / 2;
- 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;
@@
-359,7
+357,7
@@
static __init int __init ja_pci_init(void)
arch_initcall(ja_pci_init);
arch_initcall(ja_pci_init);
-void __init plat_setup(void)
+void __init plat_
mem_
setup(void)
{
unsigned int tmpword;
{
unsigned int tmpword;
@@
-370,8
+368,8
@@
void __init plat_setup(void)
pm_power_off = momenco_jaguar_power_off;
/*
pm_power_off = momenco_jaguar_power_off;
/*
- * initrd_start = (ulong)jaguar_initrd_start;
- * initrd_end = (ulong)jaguar_initrd_start + (ulong)jaguar_initrd_size;
+ * initrd_start = (u
nsigned
long)jaguar_initrd_start;
+ * initrd_end = (u
nsigned
long)jaguar_initrd_start + (ulong)jaguar_initrd_size;
* initrd_below_start_ok = 1;
*/
* initrd_below_start_ok = 1;
*/