diff options
| author |   Alan Cox <alan@linux.intel.com> | 2012-07-17 17:06:20 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-17 09:11:50 -0700 |
| commit | ce7240e445303de3ca66e6d08f17a2ec278a5bf6 (patch) | |
| tree | 8ee84f5ae903dcd72e0641ae4932da71cd9a7b4b /drivers/char/mwave/mwavedd.c | |
| parent | tty: Fix up PPC fallout from the termios move (diff) | |
| download | linux-dev-ce7240e445303de3ca66e6d08f17a2ec278a5bf6.tar.xz linux-dev-ce7240e445303de3ca66e6d08f17a2ec278a5bf6.zip | |
8250: three way resolve of the 8250 diffs
This resolves the differences between the original 8250 patch, the revised 8250 patch
and the independant clean up of the octeon driver (to use platform devices properly yay!)
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/mwave/mwavedd.c')
| -rw-r--r-- | drivers/char/mwave/mwavedd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/char/mwave/mwavedd.c b/drivers/char/mwave/mwavedd.c index 1d82d5838f0c..164544afd680 100644 --- a/drivers/char/mwave/mwavedd.c +++ b/drivers/char/mwave/mwavedd.c @@ -430,7 +430,7 @@ static ssize_t mwave_write(struct file *file, const char __user *buf, static int register_serial_portandirq(unsigned int port, int irq) { - struct uart_port uart; + struct uart_8250_port uart; switch ( port ) { case 0x3f8: @@ -462,14 +462,14 @@ static int register_serial_portandirq(unsigned int port, int irq) } /* switch */ /* irq is okay */ - memset(&uart, 0, sizeof(struct uart_port)); + memset(&uart, 0, sizeof(uart)); - uart.uartclk = 1843200; - uart.iobase = port; - uart.irq = irq; - uart.iotype = UPIO_PORT; - uart.flags = UPF_SHARE_IRQ; - return serial8250_register_port(&uart); + uart.port.uartclk = 1843200; + uart.port.iobase = port; + uart.port.irq = irq; + uart.port.iotype = UPIO_PORT; + uart.port.flags = UPF_SHARE_IRQ; + return serial8250_register_8250_port(&uart); } |