AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

serial: omap: fix compile breakage

Browse Source 
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>
This commit is contained in:
Felipe Balbi 2012-09-07 18:34:19 +03:00 committed by Greg Kroah-Hartman
parent b1b799164a
commit e36851d0fa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/plat-omap/include/plat/omap-serial.h
View File

@ -105,8 +105,4 @@ struct uart_omap_dma {
unsigned int rx_timeout; unsigned int rx_timeout;
}; };
int DTR_gpio;
int DTR_inverted;
int DTR_active;
#endif /* __OMAP_SERIAL_H__ */ #endif /* __OMAP_SERIAL_H__ */

4
drivers/tty/serial/omap-serial.c
View File

@ -100,6 +100,10 @@ struct uart_omap_port {
u8 wakeups_enabled; u8 wakeups_enabled;
unsigned int irq_pending:1; unsigned int irq_pending:1;
int DTR_gpio;
int DTR_inverted;
int DTR_active;
struct pm_qos_request pm_qos_request; struct pm_qos_request pm_qos_request;
u32 latency; u32 latency;
u32 calc_latency; u32 calc_latency;