Skip to content

Commit

Permalink
serial: omap: fix compile breakage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felipe Balbi authored and Greg Kroah-Hartman committed Sep 7, 2012
1 parent b1b7991 commit e36851d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 0 additions & 4 deletions arch/arm/plat-omap/include/plat/omap-serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
4 changes: 4 additions & 0 deletions drivers/tty/serial/omap-serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit e36851d

Please sign in to comment.