git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
tty
/
serial
/
samsung.c
diff --git
a/drivers/tty/serial/samsung.c
b/drivers/tty/serial/samsung.c
index
12e5249
..
e514b3a
100644
(file)
--- a/
drivers/tty/serial/samsung.c
+++ b/
drivers/tty/serial/samsung.c
@@
-1006,7
+1006,6
@@
static void s3c24xx_serial_resetport(struct uart_port *port,
ucon &= ucon_mask;
wr_regl(port, S3C2410_UCON, ucon | cfg->ucon);
- wr_regl(port, S3C2410_ULCON, cfg->ulcon);
/* reset both fifos */
wr_regl(port, S3C2410_UFCON, cfg->ufcon | S3C2410_UFCON_RESETBOTH);