Skip to content

L
linux-davinci-2.6.23
Commit b620cc2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents 036bfdcb 31f919c3
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
arch/arm/mach-clps711x/fortunet.c
View file @ b620cc2c
...@@ -31,6 +31,8 @@ ...@@ -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
View file @ b620cc2c
...@@ -860,7 +860,7 @@ imx_console_setup(struct console *co, char *options) ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment