diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-01 17:02:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-01 17:02:13 -0700 |
| commit | b620cc2cd80393b9a0f9a76806cb7f9e91671dac (patch) | |
| tree | 6291cc977570bfbdd209fb55602806b8f4cd8d11 | |
| parent | 036bfdcb0dfa39fc1ff5ded196b5fd92f1bb9ea8 (diff) | |
| parent | 31f919c3296a30427b18458b13c308513a62c3b9 (diff) | |
| download | linux-3.10-b620cc2cd80393b9a0f9a76806cb7f9e91671dac.tar.gz linux-3.10-b620cc2cd80393b9a0f9a76806cb7f9e91671dac.tar.bz2 linux-3.10-b620cc2cd80393b9a0f9a76806cb7f9e91671dac.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
| -rw-r--r-- | arch/arm/mach-clps711x/fortunet.c | 2 | ||||
| -rw-r--r-- | drivers/serial/imx.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index f83a59761e0..3d88da0c287 100644 --- 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 = { diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 4c985e6b378..4e1e80adaf1 100644 --- 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, |