diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:02:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:02:24 -0700 |
| commit | 24c83d45d76303db8325b8553a05c69c838ef370 (patch) | |
| tree | 50c90d1c9b05aeec86e046f7d0f758b40c6d05ce | |
| parent | 1077682b2f97cee76a79cf38bab3fa022a97d9f8 (diff) | |
| parent | 66172d259b816cbb65878a05d30771935a6928e8 (diff) | |
| download | linux-stable-24c83d45d76303db8325b8553a05c69c838ef370.tar.gz linux-stable-24c83d45d76303db8325b8553a05c69c838ef370.tar.bz2 linux-stable-24c83d45d76303db8325b8553a05c69c838ef370.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/misc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/misc/ibmasm/uart.c | 20 | ||||
| -rw-r--r-- | drivers/serial/serial_lh7a40x.c | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index dea6589d1533..7fc692a8f5b0 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -6,7 +6,7 @@ menu "Misc devices" config IBM_ASM tristate "Device driver for IBM RSA service processor" - depends on X86 && PCI && EXPERIMENTAL && BROKEN + depends on X86 && PCI && EXPERIMENTAL ---help--- This option enables device driver support for in-band access to the IBM RSA (Condor) service processor in eServer xSeries systems. diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c index 914804512dba..7e98434cfa37 100644 --- a/drivers/misc/ibmasm/uart.c +++ b/drivers/misc/ibmasm/uart.c @@ -25,15 +25,15 @@ #include <linux/termios.h> #include <linux/tty.h> #include <linux/serial_core.h> -#include <linux/serial.h> #include <linux/serial_reg.h> +#include <linux/serial_8250.h> #include "ibmasm.h" #include "lowlevel.h" void ibmasm_register_uart(struct service_processor *sp) { - struct serial_struct serial; + struct uart_port uport; void __iomem *iomem_base; iomem_base = sp->base_address + SCOUT_COM_B_BASE; @@ -47,14 +47,14 @@ void ibmasm_register_uart(struct service_processor *sp) return; } - memset(&serial, 0, sizeof(serial)); - serial.irq = sp->irq; - serial.baud_base = 3686400 / 16; - serial.flags = UPF_AUTOPROBE | UPF_SHARE_IRQ; - serial.io_type = UPIO_MEM; - serial.iomem_base = iomem_base; + memset(&uport, 0, sizeof(struct uart_port)); + uport.irq = sp->irq; + uport.uartclk = 3686400; + uport.flags = UPF_AUTOPROBE | UPF_SHARE_IRQ; + uport.iotype = UPIO_MEM; + uport.membase = iomem_base; - sp->serial_line = register_serial(&serial); + sp->serial_line = serial8250_register_port(&uport); if (sp->serial_line < 0) { dev_err(sp->dev, "Failed to register serial port\n"); return; @@ -68,5 +68,5 @@ void ibmasm_unregister_uart(struct service_processor *sp) return; disable_uart_interrupts(sp->base_address); - unregister_serial(sp->serial_line); + serial8250_unregister_port(sp->serial_line); } diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 32f808d157a1..8302376800c0 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c @@ -207,7 +207,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port) return; } if (uart_circ_empty (xmit) || uart_tx_stopped (port)) { - lh7a40xuart_stop_tx (port, 0); + lh7a40xuart_stop_tx (port); return; } @@ -229,7 +229,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port) uart_write_wakeup (port); if (uart_circ_empty (xmit)) - lh7a40xuart_stop_tx (port, 0); + lh7a40xuart_stop_tx (port); } static void lh7a40xuart_modem_status (struct uart_port* port) |