| Message ID | 1253772553.7103.402.camel@pasglop (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 09dd3fc19c09f79115267361ecd7d5c5d2c27a3a |
| Headers | show |
On Thu, 2009-09-24 at 16:09 +1000, Benjamin Herrenschmidt wrote: > Commit ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 > "serial: kill off uart_info" > > broke the build of this driver, possibly because the driver isn't > in drivers/serial and thus was missed by Alan. This fixes it. I must have a serious amount of shit in my eyes :-) For some reason I was persuaded the driver was in arch/powerpc .. well, it -is- in drivers/serial, so yes, Alan did miss it somewhat but not because it was in the wrong place :-) Patch is still good tho, I'll fix up the comment in my tree. Sorry, Ben.
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index 8d349b2..300cea7 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c @@ -649,7 +649,7 @@ static int cpm_uart_tx_pump(struct uart_port *port) u8 *p; int count; struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port; - struct circ_buf *xmit = &port->info->xmit; + struct circ_buf *xmit = &port->state->xmit; /* Handle xon/xoff */ if (port->x_char) {
Commit ebd2c8f6d2ec4012c267ecb95e72a57b8355a705 "serial: kill off uart_info" broke the build of this driver, possibly because the driver isn't in drivers/serial and thus was missed by Alan. This fixes it. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- Vitaly: Care to send a patch to move the whole driver to drivers/serial where it belongs or there's too many nasty dependencies to headers inside of arch/powerpc/ ? In the meantime, I'll put that in my merge branch which I'll ask Linus to pull hopefully tomorrow (waiting for a test result from Rex to see if the 8xx problems are all gone) Cheers, Ben. ---