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
/
atlas
/
atlas_setup.c
diff --git
a/arch/mips/mips-boards/atlas/atlas_setup.c
b/arch/mips/mips-boards/atlas/atlas_setup.c
index
3940bb8
..
c20d401
100644
(file)
--- a/
arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/
arch/mips/mips-boards/atlas/atlas_setup.c
@@
-50,8
+50,10
@@
const char *get_system_type(void)
return "MIPS Atlas";
}
return "MIPS Atlas";
}
-
static int __init atlas
_setup(void)
+
void __init plat
_setup(void)
{
{
+ mips_pcibios_init();
+
ioport_resource.end = 0x7fffffff;
serial_init ();
ioport_resource.end = 0x7fffffff;
serial_init ();
@@
-63,13
+65,9
@@
static int __init atlas_setup(void)
board_time_init = mips_time_init;
board_timer_setup = mips_timer_setup;
board_time_init = mips_time_init;
board_timer_setup = mips_timer_setup;
- rtc_get_time = mips_rtc_get_time;
-
- return 0;
+ rtc_mips_get_time = mips_rtc_get_time;
}
}
-early_initcall(atlas_setup);
-
static void __init serial_init(void)
{
#ifdef CONFIG_SERIAL_8250
static void __init serial_init(void)
{
#ifdef CONFIG_SERIAL_8250
@@
-84,8
+82,8
@@
static void __init serial_init(void)
#endif
s.irq = ATLASINT_UART;
s.uartclk = ATLAS_BASE_BAUD * 16;
#endif
s.irq = ATLASINT_UART;
s.uartclk = ATLAS_BASE_BAUD * 16;
- s.flags =
ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | UPF_RESOURCES | ASYNC
_AUTO_IRQ;
- s.iotype =
SERIAL_
IO_PORT;
+ s.flags =
UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF
_AUTO_IRQ;
+ s.iotype =
UP
IO_PORT;
s.regshift = 3;
if (early_serial_setup(&s) != 0) {
s.regshift = 3;
if (early_serial_setup(&s) != 0) {