diff options
| author | Ke Qinghua <qinghua.ke@freescale.com> | 2014-07-03 13:50:28 +0800 |
|---|---|---|
| committer | Ke Qinghua <qinghua.ke@freescale.com> | 2014-07-03 13:50:28 +0800 |
| commit | c62bfe55daa2f6d14b1bc2a67144f1851639b663 (patch) | |
| tree | 76bec5a00dd221496b8321401b965f7f9fad0ea5 /drivers/char | |
| parent | e763de5153e716a45e5b1efd5805e5b78d302918 (diff) | |
| parent | 907fc0dc02add88158852cde871644c85fb148ef (diff) | |
Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' into imx_3.10.y_android
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/imx_mcc/imx_mcc_tty.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/imx_mcc/imx_mcc_tty.c b/drivers/char/imx_mcc/imx_mcc_tty.c index 843b5fcbd010..4ce5b9b8bd8e 100644 --- a/drivers/char/imx_mcc/imx_mcc_tty.c +++ b/drivers/char/imx_mcc/imx_mcc_tty.c @@ -198,7 +198,6 @@ static int __init imxmcctty_init(void) tty_port_init(&cport->port); cport->port.ops = &mcctty_port_ops; spin_lock_init(&cport->rx_lock); - spin_lock_init(&cport->tx_lock); ret = tty_register_driver(mcctty_driver); if (ret < 0) { |