diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/tty/serial/samsung.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/tty/serial/samsung.c')
| -rw-r--r-- | drivers/tty/serial/samsung.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 2335edafe903..9e2fa8d784e2 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c | |||
| @@ -64,7 +64,7 @@ | |||
| 64 | #define tx_enabled(port) ((port)->unused[0]) | 64 | #define tx_enabled(port) ((port)->unused[0]) |
| 65 | #define rx_enabled(port) ((port)->unused[1]) | 65 | #define rx_enabled(port) ((port)->unused[1]) |
| 66 | 66 | ||
| 67 | /* flag to ignore all characters comming in */ | 67 | /* flag to ignore all characters coming in */ |
| 68 | #define RXSTAT_DUMMY_READ (0x10000000) | 68 | #define RXSTAT_DUMMY_READ (0x10000000) |
| 69 | 69 | ||
| 70 | static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port) | 70 | static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port) |
| @@ -291,7 +291,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id) | |||
| 291 | goto out; | 291 | goto out; |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | /* if there isnt anything more to transmit, or the uart is now | 294 | /* if there isn't anything more to transmit, or the uart is now |
| 295 | * stopped, disable the uart and exit | 295 | * stopped, disable the uart and exit |
| 296 | */ | 296 | */ |
| 297 | 297 | ||