aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/mach
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-arm/mach')
-rw-r--r--include/asm-arm/mach/serial_at91.h (renamed from include/asm-arm/mach/serial_at91rm9200.h)8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-arm/mach/serial_at91rm9200.h b/include/asm-arm/mach/serial_at91.h
index 98f4b0cb883c..18bc4e00e475 100644
--- a/include/asm-arm/mach/serial_at91rm9200.h
+++ b/include/asm-arm/mach/serial_at91.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/include/asm-arm/mach/serial_at91rm9200.h 2 * linux/include/asm-arm/mach/serial_at91.h
3 * 3 *
4 * Based on serial_sa1100.h by Nicolas Pitre 4 * Based on serial_sa1100.h by Nicolas Pitre
5 * 5 *
@@ -15,7 +15,7 @@ struct uart_port;
15 * This is a temporary structure for registering these 15 * This is a temporary structure for registering these
16 * functions; it is intended to be discarded after boot. 16 * functions; it is intended to be discarded after boot.
17 */ 17 */
18struct at91rm9200_port_fns { 18struct at91_port_fns {
19 void (*set_mctrl)(struct uart_port *, u_int); 19 void (*set_mctrl)(struct uart_port *, u_int);
20 u_int (*get_mctrl)(struct uart_port *); 20 u_int (*get_mctrl)(struct uart_port *);
21 void (*enable_ms)(struct uart_port *); 21 void (*enable_ms)(struct uart_port *);
@@ -26,11 +26,9 @@ struct at91rm9200_port_fns {
26}; 26};
27 27
28#if defined(CONFIG_SERIAL_AT91) 28#if defined(CONFIG_SERIAL_AT91)
29void at91_register_uart_fns(struct at91rm9200_port_fns *fns); 29void at91_register_uart_fns(struct at91_port_fns *fns);
30void at91_register_uart(int idx, int port);
31#else 30#else
32#define at91_register_uart_fns(fns) do { } while (0) 31#define at91_register_uart_fns(fns) do { } while (0)
33#define at91_register_uart(idx,port) do { } while (0)
34#endif 32#endif
35 33
36 34