diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 10:40:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 10:40:11 -0800 |
| commit | 0676fc122e712751e60ae16e0f2241064711f888 (patch) | |
| tree | 1b376ff6ab76995f888550d267ee55073532234a /drivers/serial | |
| parent | 912cbe3c5be5afb28184bb2e49a48fa4a1b098db (diff) | |
| parent | d56c524afaa87ae224b5821ef101891ce076c321 (diff) | |
| download | lwn-0676fc122e712751e60ae16e0f2241064711f888.tar.gz lwn-0676fc122e712751e60ae16e0f2241064711f888.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/clps711x.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c index 6a67e8f585b3..87ef368384fb 100644 --- a/drivers/serial/clps711x.c +++ b/drivers/serial/clps711x.c @@ -408,11 +408,7 @@ static struct uart_port clps711x_ports[UART_NR] = { { .iobase = SYSCON1, .irq = IRQ_UTXINT1, /* IRQ_URXINT1, IRQ_UMSINT */ -#ifdef CONFIG_MP1000_90MHZ - .uartclk = 4515840, -#else .uartclk = 3686400, -#endif .fifosize = 16, .ops = &clps711x_pops, .line = 0, @@ -421,11 +417,7 @@ static struct uart_port clps711x_ports[UART_NR] = { { .iobase = SYSCON2, .irq = IRQ_UTXINT2, /* IRQ_URXINT2 */ -#ifdef CONFIG_MP1000_90MHZ - .uartclk = 4515840, -#else .uartclk = 3686400, -#endif .fifosize = 16, .ops = &clps711x_pops, .line = 1, @@ -559,7 +551,6 @@ console_initcall(clps711xuart_console_init); static struct uart_driver clps711x_reg = { .driver_name = "ttyCL", .dev_name = "ttyCL", - .devfs_name = "ttyCL", .major = SERIAL_CLPS711X_MAJOR, .minor = SERIAL_CLPS711X_MINOR, .nr = UART_NR, |