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

Commit b620cc2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 036bfdcb 31f919c3

arch/arm/mach-clps711x/fortunet.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,8 @@ 




#include <asm/mach/arch.h>

#include <asm/mach/arch.h>





#include <asm/memory.h>



#include "common.h"

#include "common.h"





struct meminfo memmap = {

struct meminfo memmap = {

drivers/serial/imx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -860,7 +860,7 @@ imx_console_setup(struct console *co, char *options) 
	return uart_set_options(&sport->port, co, baud, parity, bits, flow);

	return uart_set_options(&sport->port, co, baud, parity, bits, flow);

}

}





extern struct uart_driver imx_reg;

static struct uart_driver imx_reg;

static struct console imx_console = {

static struct console imx_console = {

	.name		= "ttySMX",

	.name		= "ttySMX",

	.write		= imx_console_write,

	.write		= imx_console_write,