[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>

diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index f930df042f9baede16cf45e4a77a71ff747d9b27..9217ee6c786576886039f819ebff397b01f99f2d 100644 (file)
--- 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 <asm/arch/board.h>
 #include <asm/arch/at91_pdc.h>
 #ifdef CONFIG_ARM
-#include <asm/arch/system.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/gpio.h>
 #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.