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>

diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 3c9fd3e4263fde70136f92dca9566f87ba3c4c79..a531149823bbef3ff608606f45b544c5f633726e 100644 (file)
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -105,8 +105,4 @@ struct uart_omap_dma {
        unsigned int            rx_timeout;
 };
 
-
-       int                     DTR_gpio;
-       int                     DTR_inverted;
-       int                     DTR_active;
 #endif /* __OMAP_SERIAL_H__ */

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index cfd209485af7f0ef27f240e7901a3ef4abc7a2de..0a6e78e15a4070d1d60c930b2c5462f3ba7bb7b6 100644 (file)
--- 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;