lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-10-01 17:02:13 -07:00
parent 036bfdcb0d 31f919c329
commit b620cc2cd8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-clps711x/fortunet.c
View File

@@ -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 = {

2
drivers/serial/imx.c
View File

@@ -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,