Commit e36851d0 authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman

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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b1b79916
...@@ -105,8 +105,4 @@ struct uart_omap_dma { ...@@ -105,8 +105,4 @@ struct uart_omap_dma {
unsigned int rx_timeout; unsigned int rx_timeout;
}; };
int DTR_gpio;
int DTR_inverted;
int DTR_active;
#endif /* __OMAP_SERIAL_H__ */ #endif /* __OMAP_SERIAL_H__ */
...@@ -100,6 +100,10 @@ struct uart_omap_port { ...@@ -100,6 +100,10 @@ struct uart_omap_port {
u8 wakeups_enabled; u8 wakeups_enabled;
unsigned int irq_pending:1; unsigned int irq_pending:1;
int DTR_gpio;
int DTR_inverted;
int DTR_active;
struct pm_qos_request pm_qos_request; struct pm_qos_request pm_qos_request;
u32 latency; u32 latency;
u32 calc_latency; u32 calc_latency;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment