From c99a6c7770943c1925fea9df29d90d8e0e8cc818 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Fri, 7 Sep 2012 18:34:19 +0300
Subject: [PATCH] --- yaml --- r: 325748 b: refs/heads/master c:
 e36851d0fa94b0f7802b3cc80406dbd3ef4f2f16 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/arch/arm/plat-omap/include/plat/omap-serial.h | 4 ----
 trunk/drivers/tty/serial/omap-serial.c              | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b4526e8a9e9c..ec297edd470d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1b799164afb22711e6bee718f2a5ee669bb9517
+refs/heads/master: e36851d0fa94b0f7802b3cc80406dbd3ef4f2f16
diff --git a/trunk/arch/arm/plat-omap/include/plat/omap-serial.h b/trunk/arch/arm/plat-omap/include/plat/omap-serial.h
index 3c9fd3e4263f..a531149823bb 100644
--- a/trunk/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/trunk/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/trunk/drivers/tty/serial/omap-serial.c b/trunk/drivers/tty/serial/omap-serial.c
index cfd209485af7..0a6e78e15a40 100644
--- a/trunk/drivers/tty/serial/omap-serial.c
+++ b/trunk/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;