diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /drivers/serial/sunhv.c | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'drivers/serial/sunhv.c')
| -rw-r--r-- | drivers/serial/sunhv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c index 145c0281495d..2847336742d7 100644 --- a/drivers/serial/sunhv.c +++ b/drivers/serial/sunhv.c | |||
| @@ -499,7 +499,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig | |||
| 499 | } else | 499 | } else |
| 500 | spin_lock(&port->lock); | 500 | spin_lock(&port->lock); |
| 501 | 501 | ||
| 502 | spin_lock_irqsave(&port->lock, flags); | ||
| 503 | for (i = 0; i < n; i++) { | 502 | for (i = 0; i < n; i++) { |
| 504 | if (*s == '\n') | 503 | if (*s == '\n') |
| 505 | sunhv_console_putchar(port, '\r'); | 504 | sunhv_console_putchar(port, '\r'); |