From: Andrew Victor Date: Mon, 4 Dec 2006 08:37:20 +0000 (+0100) Subject: [ARM] 3973/1: AT91: Serial driver compile fix X-Git-Tag: v2.6.20-rc1~15^2^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c2f5ccfbd5198cadd03d8c4bb0e28175b78cd910;p=linux-2.6-omap-h63xx.git [ARM] 3973/1: AT91: Serial driver compile fix 1. The CPU identification has moved from to . 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 Signed-off-by: Russell King --- diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index f930df042f9..9217ee6c786 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c @@ -1,5 +1,5 @@ /* - * linux/drivers/char/at91_serial.c + * linux/drivers/char/atmel_serial.c * * Driver for Atmel AT91 / AT32 Serial ports * Copyright (C) 2003 Rick Bronson @@ -40,7 +40,7 @@ #include #include #ifdef CONFIG_ARM -#include +#include #include #endif @@ -137,7 +137,7 @@ static void atmel_set_mctrl(struct uart_port *port, u_int mctrl) unsigned int control = 0; unsigned int mode; -#ifdef CONFIG_ARM +#ifdef CONFIG_ARCH_AT91RM9200 if (cpu_is_at91rm9200()) { /* * AT91RM9200 Errata #39: RTS0 is not internally connected to PA21.