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:/home/rmk/linux-2.6-serial
[pandora-kernel.git]
/
arch
/
mips
/
cobalt
/
setup.c
diff --git
a/arch/mips/cobalt/setup.c
b/arch/mips/cobalt/setup.c
index
d358a11
..
b9713a7
100644
(file)
--- a/
arch/mips/cobalt/setup.c
+++ b/
arch/mips/cobalt/setup.c
@@
-5,7
+5,7
@@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1996, 1997, 2004 by Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 1996, 1997, 2004
, 05
by Ralf Baechle (ralf@linux-mips.org)
* Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
*
*/
* Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
*
*/
@@
-13,6
+13,7
@@
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/init.h>
+#include <linux/pm.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
@@
-25,7
+26,7
@@
#include <asm/gt64120.h>
#include <asm/serial.h>
#include <asm/gt64120.h>
#include <asm/serial.h>
-#include <asm/cobalt/cobalt.h>
+#include <asm/
mach-
cobalt/cobalt.h>
extern void cobalt_machine_restart(char *command);
extern void cobalt_machine_halt(void);
extern void cobalt_machine_restart(char *command);
extern void cobalt_machine_halt(void);
@@
-99,7
+100,7
@@
void __init plat_setup(void)
_machine_restart = cobalt_machine_restart;
_machine_halt = cobalt_machine_halt;
_machine_restart = cobalt_machine_restart;
_machine_halt = cobalt_machine_halt;
-
_machine
_power_off = cobalt_machine_power_off;
+
pm
_power_off = cobalt_machine_power_off;
board_timer_setup = cobalt_timer_setup;
board_timer_setup = cobalt_timer_setup;
@@
-139,7
+140,7
@@
void __init plat_setup(void)
uart.type = PORT_UNKNOWN;
uart.uartclk = 18432000;
uart.irq = COBALT_SERIAL_IRQ;
uart.type = PORT_UNKNOWN;
uart.uartclk = 18432000;
uart.irq = COBALT_SERIAL_IRQ;
- uart.flags =
STD_COM_FLAGS
;
+ uart.flags =
UPF_BOOT_AUTOCONF | UPF_SKIP_TEST
;
uart.iobase = 0xc800000;
uart.iotype = UPIO_PORT;
uart.iobase = 0xc800000;
uart.iotype = UPIO_PORT;