summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2012-09-07 18:34:19 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-07 08:39:39 -0700
commite36851d0fa94b0f7802b3cc80406dbd3ef4f2f16 (patch)
treebfcf01207c1f267bb58d531d6b491e762270d830 /arch/arm/plat-omap
parentb1b799164afb22711e6bee718f2a5ee669bb9517 (diff)
downloadblackbird-op-linux-e36851d0fa94b0f7802b3cc80406dbd3ef4f2f16.tar.gz
blackbird-op-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 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/include/plat/omap-serial.h4
1 files changed, 0 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 {
unsigned int rx_timeout;
};
-
- int DTR_gpio;
- int DTR_inverted;
- int DTR_active;
#endif /* __OMAP_SERIAL_H__ */
OpenPOWER on IntegriCloud