diff options
| author | Felipe Balbi <balbi@ti.com> | 2012-09-07 17:34:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-07 17:39:39 +0200 |
| commit | e36851d0fa94b0f7802b3cc80406dbd3ef4f2f16 (patch) | |
| tree | bfcf01207c1f267bb58d531d6b491e762270d830 /drivers/tty/serial | |
| parent | tty_register_device_attr updated for tty-next (diff) | |
| download | linux-e36851d0fa94b0f7802b3cc80406dbd3ef4f2f16.tar.xz linux-e36851d0fa94b0f7802b3cc80406dbd3ef4f2f16.zip | |
serial: omap: fix compile breakage
when rebasing patches on top of Greg's tty-next,
it looks like automerge broke a few things which
I didn't catch (for whatever reason I didn't
have OMAP Serial enabled on .config) so I ended
up breaking the build on Greg's tty-next branch.
Fix the breakage by re-adding the three missing
members on struct uart_omap_port.
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index cfd209485af7..0a6e78e15a40 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -100,6 +100,10 @@ struct uart_omap_port { u8 wakeups_enabled; unsigned int irq_pending:1; + int DTR_gpio; + int DTR_inverted; + int DTR_active; + struct pm_qos_request pm_qos_request; u32 latency; u32 calc_latency; |