diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
| commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
| tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /arch/arm/mach-omap1/serial.c | |
| parent | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-omap1/serial.c')
| -rw-r--r-- | arch/arm/mach-omap1/serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index e924e0c6a4ce..9b4cd698bec8 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
| @@ -30,9 +30,9 @@ | |||
| 30 | #include <asm/arch/pm.h> | 30 | #include <asm/arch/pm.h> |
| 31 | #endif | 31 | #endif |
| 32 | 32 | ||
| 33 | static struct clk * uart1_ck = NULL; | 33 | static struct clk * uart1_ck; |
| 34 | static struct clk * uart2_ck = NULL; | 34 | static struct clk * uart2_ck; |
| 35 | static struct clk * uart3_ck = NULL; | 35 | static struct clk * uart3_ck; |
| 36 | 36 | ||
| 37 | static inline unsigned int omap_serial_in(struct plat_serial8250_port *up, | 37 | static inline unsigned int omap_serial_in(struct plat_serial8250_port *up, |
| 38 | int offset) | 38 | int offset) |