Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17be03f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents cce0cac1 85d1494e

arch/arm/mach-imx/mx1ads.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <asm/mach/arch.h>

#include <linux/interrupt.h>

#include "generic.h"

#include <asm/serial.h>



static struct resource cs89x0_resources[] = {

	[0] = {

arch/mips/cobalt/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void __init plat_setup(void) 
		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;

arch/mips/lasat/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ void __init serial_init(void) 


	memset(&s, 0, sizeof(s));



	s.flags = STD_COM_FLAGS;

	s.iotype = SERIAL_IO_MEM;

	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;

	s.iotype = UPIO_MEM;



	if (mips_machtype == MACH_LASAT_100) {

		s.uartclk = LASAT_BASE_BAUD_100 * 16;

arch/mips/mips-boards/atlas/atlas_setup.c

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ static void __init serial_init(void) 
#endif

	s.irq = ATLASINT_UART;

	s.uartclk = ATLAS_BASE_BAUD * 16;

	s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;

	s.iotype = SERIAL_IO_PORT;

	s.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ;

	s.iotype = UPIO_PORT;

	s.regshift = 3;



	if (early_serial_setup(&s) != 0) {

arch/mips/mips-boards/sead/sead_setup.c

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ static void __init serial_init(void) 
#endif

	s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;

	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) {