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
/
lasat
/
setup.c
diff --git
a/arch/mips/lasat/setup.c
b/arch/mips/lasat/setup.c
index
e371ed5
..
14c5516
100644
(file)
--- a/
arch/mips/lasat/setup.c
+++ b/
arch/mips/lasat/setup.c
@@
-22,7
+22,6
@@
*
* Lasat specific setup.
*/
*
* Lasat specific setup.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/pci.h>
@@
-35,7
+34,6
@@
#include <asm/cpu.h>
#include <asm/bootinfo.h>
#include <asm/irq.h>
#include <asm/cpu.h>
#include <asm/bootinfo.h>
#include <asm/irq.h>
-#include <asm/serial.h>
#include <asm/lasat/lasat.h>
#include <asm/lasat/serial.h>
#include <asm/lasat/lasat.h>
#include <asm/lasat/serial.h>
@@
-105,7
+103,7
@@
static int lasat_panic_prom_monitor(struct notifier_block *this,
return NOTIFY_DONE;
}
return NOTIFY_DONE;
}
-static struct notifier_block lasat_panic_block[] =
+static struct notifier_block lasat_panic_block[] =
{
{ lasat_panic_display, NULL, INT_MAX },
{ lasat_panic_prom_monitor, NULL, INT_MIN }
{
{ lasat_panic_display, NULL, INT_MAX },
{ lasat_panic_prom_monitor, NULL, INT_MIN }
@@
-116,12
+114,9
@@
static void lasat_time_init(void)
mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2;
}
mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2;
}
-
static void las
at_timer_setup(struct irqaction *irq)
+
void __init pl
at_timer_setup(struct irqaction *irq)
{
{
-
- write_c0_compare(
- read_c0_count() +
- mips_hpt_frequency / HZ);
+ write_c0_compare( read_c0_count() + mips_hpt_frequency / HZ);
change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
}
change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
}
@@
-134,8
+129,8
@@
void __init serial_init(void)
memset(&s, 0, sizeof(s));
memset(&s, 0, sizeof(s));
- s.flags =
STD_COM_FLAGS
;
- s.iotype =
SERIAL_
IO_MEM;
+ s.flags =
UPF_BOOT_AUTOCONF | UPF_SKIP_TEST
;
+ s.iotype =
UP
IO_MEM;
if (mips_machtype == MACH_LASAT_100) {
s.uartclk = LASAT_BASE_BAUD_100 * 16;
if (mips_machtype == MACH_LASAT_100) {
s.uartclk = LASAT_BASE_BAUD_100 * 16;
@@
-155,7
+150,7
@@
void __init serial_init(void)
}
#endif
}
#endif
-
static int __init lasat
_setup(void)
+
void __init plat_mem
_setup(void)
{
int i;
lasat_misc = &lasat_misc_info[mips_machtype];
{
int i;
lasat_misc = &lasat_misc_info[mips_machtype];
@@
-165,17
+160,17
@@
static int __init lasat_setup(void)
/* Set up panic notifier */
for (i = 0; i < sizeof(lasat_panic_block) / sizeof(struct notifier_block); i++)
/* Set up panic notifier */
for (i = 0; i < sizeof(lasat_panic_block) / sizeof(struct notifier_block); i++)
- notifier_chain_register(&panic_notifier_list, &lasat_panic_block[i]);
+ atomic_notifier_chain_register(&panic_notifier_list,
+ &lasat_panic_block[i]);
lasat_reboot_setup();
board_time_init = lasat_time_init;
lasat_reboot_setup();
board_time_init = lasat_time_init;
- board_timer_setup = lasat_timer_setup;
#ifdef CONFIG_DS1603
ds1603 = &ds_defs[mips_machtype];
#ifdef CONFIG_DS1603
ds1603 = &ds_defs[mips_machtype];
- rtc_get_time = ds1603_read;
- rtc_set_time = ds1603_set;
+ rtc_
mips_
get_time = ds1603_read;
+ rtc_
mips_
set_time = ds1603_set;
#endif
#ifdef DYNAMIC_SERIAL_INIT
#endif
#ifdef DYNAMIC_SERIAL_INIT
@@
-185,8
+180,4
@@
static int __init lasat_setup(void)
change_c0_status(ST0_BEV,0);
prom_printf("Lasat specific initialization complete\n");
change_c0_status(ST0_BEV,0);
prom_printf("Lasat specific initialization complete\n");
-
- return 0;
}
}
-
-early_initcall(lasat_setup);