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
/
mips-boards
/
sead
/
sead_setup.c
diff --git
a/arch/mips/mips-boards/sead/sead_setup.c
b/arch/mips/mips-boards/sead/sead_setup.c
index
ab6c619
..
a189dec
100644
(file)
--- a/
arch/mips/mips-boards/sead/sead_setup.c
+++ b/
arch/mips/mips-boards/sead/sead_setup.c
@@
-17,7
+17,6
@@
*
* SEAD specific setup.
*/
*
* SEAD specific setup.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/ioport.h>
@@
-36,7
+35,6
@@
extern void mips_reboot_setup(void);
extern void mips_time_init(void);
extern void mips_reboot_setup(void);
extern void mips_time_init(void);
-extern void mips_timer_setup(struct irqaction *irq);
static void __init serial_init(void);
static void __init serial_init(void);
@@
-45,20
+43,17
@@
const char *get_system_type(void)
return "MIPS SEAD";
}
return "MIPS SEAD";
}
-
static void __init sead
_setup(void)
+
void __init plat_mem
_setup(void)
{
ioport_resource.end = 0x7fffffff;
serial_init ();
board_time_init = mips_time_init;
{
ioport_resource.end = 0x7fffffff;
serial_init ();
board_time_init = mips_time_init;
- board_timer_setup = mips_timer_setup;
mips_reboot_setup();
}
mips_reboot_setup();
}
-early_initcall(sead_setup);
-
static void __init serial_init(void)
{
#ifdef CONFIG_SERIAL_8250
static void __init serial_init(void)
{
#ifdef CONFIG_SERIAL_8250
@@
-71,10
+66,10
@@
static void __init serial_init(void)
#else
s.iobase = SEAD_UART0_REGS_BASE+3;
#endif
#else
s.iobase = SEAD_UART0_REGS_BASE+3;
#endif
- s.irq =
SEAD
INT_UART0;
+ s.irq =
MIPSCPU_INT_BASE + MIPSCPU_
INT_UART0;
s.uartclk = SEAD_BASE_BAUD * 16;
s.uartclk = SEAD_BASE_BAUD * 16;
- s.flags =
ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | UPF_RESOURCES | ASYNC
_AUTO_IRQ;
- s.iotype =
0
;
+ s.flags =
UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF
_AUTO_IRQ;
+ s.iotype =
UPIO_PORT
;
s.regshift = 3;
if (early_serial_setup(&s) != 0) {
s.regshift = 3;
if (early_serial_setup(&s) != 0) {