From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 8 Feb 2006 23:21:22 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-serial
X-Git-Tag: v2.6.16-rc3~55
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17be03f0a1f42ccfccb38f7d0a94c0f0169634a6;hp=-c;p=linux-2.6

Merge master.kernel.org:/home/rmk/linux-2.6-serial
---

17be03f0a1f42ccfccb38f7d0a94c0f0169634a6
diff --combined arch/mips/cobalt/setup.c
index 050685b87a,38c0c67d6a..b9713a7230
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@@ -5,7 -5,7 +5,7 @@@
   * 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)
   *
   */
@@@ -13,7 -13,6 +13,7 @@@
  #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>
  
@@@ -26,7 -25,7 +26,7 @@@
  #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);
@@@ -100,7 -99,7 +100,7 @@@ void __init plat_setup(void
  
  	_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;
  
@@@ -140,7 -139,7 +140,7 @@@
  		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;