diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-10-04 10:02:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 13:25:05 -0400 |
commit | 5b34821a601ea079184efba2f9c7c7af61241bde (patch) | |
tree | 358b134d7b9d5c91f5582edb59489afeb1c06c7e /drivers/serial/at91_serial.c | |
parent | fefd26b3b8597a11a422d950c0d4424ff33a70ad (diff) |
[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.c | 3 |
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 @@ | |||
36 | 36 | ||
37 | #include <asm/io.h> | 37 | #include <asm/io.h> |
38 | 38 | ||
39 | #include <asm/arch/at91rm9200_usart.h> | ||
40 | #include <asm/arch/at91rm9200_pdc.h> | 39 | #include <asm/arch/at91rm9200_pdc.h> |
41 | #include <asm/mach/serial_at91.h> | 40 | #include <asm/mach/serial_at91.h> |
42 | #include <asm/arch/board.h> | 41 | #include <asm/arch/board.h> |
43 | #include <asm/arch/system.h> | 42 | #include <asm/arch/system.h> |
44 | #include <asm/arch/gpio.h> | 43 | #include <asm/arch/gpio.h> |
45 | 44 | ||
45 | #include "atmel_serial.h" | ||
46 | |||
46 | #if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 47 | #if defined(CONFIG_SERIAL_AT91_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
47 | #define SUPPORT_SYSRQ | 48 | #define SUPPORT_SYSRQ |
48 | #endif | 49 | #endif |