diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:05:58 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-08-11 20:06:34 -0700 |
| commit | 828496eb80e97b7dbd4921ad64b1799ba2e5dd5b (patch) | |
| tree | 3accafab470e063df54a08bde52a6062e562d467 /arch/arm/mach-omap2/serial.c | |
| parent | a25960e811a1aa56814deed47e257c1cddc90084 (diff) | |
| parent | 9ccd6e0d99208ca9a7bb514cc956b1de6800940b (diff) | |
| download | olio-linux-3.10-828496eb80e97b7dbd4921ad64b1799ba2e5dd5b.tar.xz olio-linux-3.10-828496eb80e97b7dbd4921ad64b1799ba2e5dd5b.zip | |
Merge branch 'mindtribe_dev' into android-3.10-bringup
Conflicts:
arch/arm/boot/dts/omap3_h1.dts
drivers/iio/imu/st_lsm6ds3/st_lsm6ds3_trigger.c
Both resolved.
Change-Id: I42c070961bff246b07179dcaae1fc784dddb0328
Diffstat (limited to 'arch/arm/mach-omap2/serial.c')
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index b1f3fb1d396..a605fe9a9a2 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -305,6 +305,9 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, omap_up.DTR_gpio = info->DTR_gpio; omap_up.DTR_inverted = info->DTR_inverted; omap_up.DTR_present = info->DTR_present; + omap_up.rts_enable_fn = info->rts_enable_fn; + omap_up.rts_disable_fn = info->rts_disable_fn; + omap_up.rts_wait = info->rts_wait; pdata = &omap_up; pdata_size = sizeof(struct omap_uart_port_info); |