提交 c2f5ccfb 编写于 作者: A Andrew Victor 提交者: Russell King

[ARM] 3973/1: AT91: Serial driver compile fix

1. The CPU identification has moved from <system.h> to <cpu.h>.

2. AT91RM9200_BASE_US0 is only defined if we are compiling in support
for the AT91RM9200.  Therefore we need to replace the CONFIG_ARM ifdef
with CONFIG_ARCH_AT91RM9200
Signed-off-by: NAndrew Victor <andrew@sanpeople.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 c019d49b
/* /*
* linux/drivers/char/at91_serial.c * linux/drivers/char/atmel_serial.c
* *
* Driver for Atmel AT91 / AT32 Serial ports * Driver for Atmel AT91 / AT32 Serial ports
* Copyright (C) 2003 Rick Bronson * Copyright (C) 2003 Rick Bronson
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <asm/arch/board.h> #include <asm/arch/board.h>
#include <asm/arch/at91_pdc.h> #include <asm/arch/at91_pdc.h>
#ifdef CONFIG_ARM #ifdef CONFIG_ARM
#include <asm/arch/system.h> #include <asm/arch/cpu.h>
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>
#endif #endif
...@@ -137,7 +137,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl) ...@@ -137,7 +137,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl)
unsigned int control = 0; unsigned int control = 0;
unsigned int mode; unsigned int mode;
#ifdef CONFIG_ARM #ifdef CONFIG_ARCH_AT91RM9200
if (cpu_is_at91rm9200()) { if (cpu_is_at91rm9200()) {
/* /*
* AT91RM9200 Errata #39: RTS0 is not internally connected to PA21. * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册