git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
mips
/
mipssim
/
sim_setup.c
diff --git
a/arch/mips/mipssim/sim_setup.c
b/arch/mips/mipssim/sim_setup.c
index
3643582
..
452c129
100644
(file)
--- a/
arch/mips/mipssim/sim_setup.c
+++ b/
arch/mips/mipssim/sim_setup.c
@@
-22,10
+22,10
@@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/ioport.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/ioport.h>
-#include <linux/serial.h>
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
#include <asm/cpu.h>
#include <asm/bootinfo.h>
#include <asm/cpu.h>
#include <asm/bootinfo.h>
@@
-36,7
+36,6
@@
#include <asm/mips-boards/simint.h>
#include <asm/mips-boards/simint.h>
-extern void sim_time_init(void);
static void __init serial_init(void);
unsigned int _isbonito = 0;
static void __init serial_init(void);
unsigned int _isbonito = 0;
@@
-54,7
+53,6
@@
void __init plat_mem_setup(void)
serial_init();
serial_init();
- board_time_init = sim_time_init;
pr_info("Linux started...\n");
#ifdef CONFIG_MIPS_MT_SMP
pr_info("Linux started...\n");
#ifdef CONFIG_MIPS_MT_SMP
@@
-84,7
+82,7
@@
static void __init serial_init(void)
/* hardware int 4 - the serial int, is CPU int 6
but poll for now */
s.irq = 0;
/* hardware int 4 - the serial int, is CPU int 6
but poll for now */
s.irq = 0;
- s.uartclk =
BASE_BAUD * 16
;
+ s.uartclk =
1843200
;
s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
s.iotype = UPIO_PORT;
s.regshift = 0;
s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
s.iotype = UPIO_PORT;
s.regshift = 0;