summaryrefslogtreecommitdiff
path: root/drivers/serial/at91_serial.c
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2006-10-04 18:02:00 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 21:25:05 +0400
commit5b34821a601ea079184efba2f9c7c7af61241bde (patch)
tree358b134d7b9d5c91f5582edb59489afeb1c06c7e /drivers/serial/at91_serial.c
parentfefd26b3b8597a11a422d950c0d4424ff33a70ad (diff)
downloadlinux-5b34821a601ea079184efba2f9c7c7af61241bde.tar.xz
[PATCH] at91_serial -> atmel_serial: at91rm9200_usart.h
Move include/asm/arch/at91rm9200_usart.h into drivers/serial and rename it atmel_usart.h. Also delete AVR32's version of this file. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/serial/at91_serial.c')
-rw-r--r--drivers/serial/at91_serial.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c
index bf4bf103e5a0..3b420aeafc24 100644
--- a/drivers/serial/at91_serial.c
+++ b/drivers/serial/at91_serial.c
@@ -36,13 +36,14 @@
#include <asm/io.h>
-#include <asm/arch/at91rm9200_usart.h>
#include <asm/arch/at91rm9200_pdc.h>
#include <asm/mach/serial_at91.h>
#include <asm/arch/board.h>
#include <asm/arch/system.h>
#include <asm/arch/gpio.h>
+#include "atmel_serial.h"
+
#if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
#define SUPPORT_SYSRQ
#endif