diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
| commit | 68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch) | |
| tree | 5fb2d14340332062e416246c5759adcaa64a2340 /drivers/tty/serial/samsung.c | |
| parent | 17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff) | |
| parent | b99374450c03bf5081b88995d91d34fb9b2fd040 (diff) | |
| download | kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2 | |
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'drivers/tty/serial/samsung.c')
| -rw-r--r-- | drivers/tty/serial/samsung.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index a3b31b8..5018800 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -483,10 +483,14 @@ static void s3c24xx_serial_set_mctrl(struct uart_port *port, unsigned int mctrl) } else { umcon &= ~S3C2410_UMCOM_AFC; } - - } else if (port->line == CONFIG_GPS_S3C_UART) { + } +#if !defined(CONFIG_MACH_KONA_EUR_LTE) && !defined(CONFIG_MACH_KONALTE_USA_ATT) + else if (port->line == CONFIG_GPS_S3C_UART) { umcon |= S3C2410_UMCOM_AFC; - } else { + } +#endif + else { + umcon &= ~S3C2410_UMCOM_AFC; } |