diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 09:49:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 09:49:58 -0800 |
| commit | a314b0cf8c0802ac9a8aba4bbecc8587a0502391 (patch) | |
| tree | c6119992be9c181e368187277826036396eb5481 /drivers | |
| parent | 49456d8d2c60a41b82d1ea8f8b49ea425e463b26 (diff) | |
| parent | 969e46a8533a3e40ce2146f6764a963b1f5505da (diff) | |
Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Replace old style lock initializer
sh: Account for cache aliases in flush_icache_range()
sh: unwinder: Fix up invalid PC refetch in dwarf unwinder.
serial: sh-sci: disable callback typo fix
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/sh-sci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 85119fb7cb5..6498bd1fb6d 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c @@ -1143,7 +1143,7 @@ static void serial_console_write(struct console *co, const char *s, while ((sci_in(port, SCxSR) & bits) != bits) cpu_relax(); - if (sci_port->disable); + if (sci_port->disable) sci_port->disable(port); } |