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

b620cc2c · Linus Torvalds · 036bfdcb · 31f919c3 · b620cc2c · b620cc2c
Commit b620cc2c authored 19 years ago by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

arch/arm/mach-clps711x/fortunet.c arch/arm/mach-clps711x/fortunet.c +2 -0

drivers/serial/imx.c drivers/serial/imx.c +1 -1

No files found.
--- a/arch/arm/mach-clps711x/fortunet.c
+++ b/arch/arm/mach-clps711x/fortunet.c
@@ -31,6 +31,8 @@

 #include <asm/mach/arch.h>

+#include <asm/memory.h>
+
 #include "common.h"

 struct meminfo memmap = {

--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -860,7 +860,7 @@ imx_console_setup(struct console *co, char *options)
 	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 = {
 	.name		= "ttySMX",
 	.write		= imx_console_write,