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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
29892b8
..
4266ce4
100644
(file)
--- a/
arch/mips/mips-boards/sead/sead_setup.c
+++ b/
arch/mips/mips-boards/sead/sead_setup.c
@@
-45,7
+45,7
@@
const char *get_system_type(void)
return "MIPS SEAD";
}
return "MIPS SEAD";
}
-
static void __init sead
_setup(void)
+
void __init plat
_setup(void)
{
ioport_resource.end = 0x7fffffff;
{
ioport_resource.end = 0x7fffffff;
@@
-57,8
+57,6
@@
static void __init sead_setup(void)
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
+69,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 | 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) {