diff options
author | Andrew Victor <andrew@sanpeople.com> | 2006-12-04 03:37:20 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-12-04 09:37:36 -0500 |
commit | c2f5ccfbd5198cadd03d8c4bb0e28175b78cd910 (patch) | |
tree | 22fad72f22ab1ffaf855051070dbc11b2868d5e8 | |
parent | c019d49b69237f195b1a31d90facf738a371841f (diff) |
[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: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/serial/atmel_serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index f930df042f9b..9217ee6c7865 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/drivers/char/at91_serial.c | 2 | * linux/drivers/char/atmel_serial.c |
3 | * | 3 | * |
4 | * Driver for Atmel AT91 / AT32 Serial ports | 4 | * Driver for Atmel AT91 / AT32 Serial ports |
5 | * Copyright (C) 2003 Rick Bronson | 5 | * Copyright (C) 2003 Rick Bronson |
@@ -40,7 +40,7 @@ | |||
40 | #include <asm/arch/board.h> | 40 | #include <asm/arch/board.h> |
41 | #include <asm/arch/at91_pdc.h> | 41 | #include <asm/arch/at91_pdc.h> |
42 | #ifdef CONFIG_ARM | 42 | #ifdef CONFIG_ARM |
43 | #include <asm/arch/system.h> | 43 | #include <asm/arch/cpu.h> |
44 | #include <asm/arch/gpio.h> | 44 | #include <asm/arch/gpio.h> |
45 | #endif | 45 | #endif |
46 | 46 | ||
@@ -137,7 +137,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl) | |||
137 | unsigned int control = 0; | 137 | unsigned int control = 0; |
138 | unsigned int mode; | 138 | unsigned int mode; |
139 | 139 | ||
140 | #ifdef CONFIG_ARM | 140 | #ifdef CONFIG_ARCH_AT91RM9200 |
141 | if (cpu_is_at91rm9200()) { | 141 | if (cpu_is_at91rm9200()) { |
142 | /* | 142 | /* |
143 | * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21. | 143 | * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21. |