aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-omap/include/plat/omap-serial.h4
-rw-r--r--drivers/tty/serial/omap-serial.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 3c9fd3e4263f..a531149823bb 100644
--- 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 {
105 unsigned int rx_timeout; 105 unsigned int rx_timeout;
106}; 106};
107 107
108
109 int DTR_gpio;
110 int DTR_inverted;
111 int DTR_active;
112#endif /* __OMAP_SERIAL_H__ */ 108#endif /* __OMAP_SERIAL_H__ */
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 {
100 u8 wakeups_enabled; 100 u8 wakeups_enabled;
101 unsigned int irq_pending:1; 101 unsigned int irq_pending:1;
102 102
103 int DTR_gpio;
104 int DTR_inverted;
105 int DTR_active;
106
103 struct pm_qos_request pm_qos_request; 107 struct pm_qos_request pm_qos_request;
104 u32 latency; 108 u32 latency;
105 u32 calc_latency; 109 u32 calc_latency;