Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/plat-omap/include/plat/omap-serial.h

+0 −4
Original line number Diff line number Diff line
@@ -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__ */

drivers/tty/serial/omap-serial.c

+4 −0
Original line number Diff line number Diff line
@@ -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;