diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 06:24:00 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-17 06:24:00 +0400 |
| commit | 8d2b6b3ae280dcf6f6c7a95623670a57cdf562ed (patch) | |
| tree | 79e0c663f37c380735a41031abaa73b4c299c9ca /drivers/tty | |
| parent | 90a24a4a7e8f8b3488438276e1d15bb3762df31e (diff) | |
| parent | 0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb (diff) | |
| download | linux-8d2b6b3ae280dcf6f6c7a95623670a57cdf562ed.tar.xz | |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH updates from Paul Mundt.
The bulk of this is the UAPI disintegration for SH.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: Fix up more fallout from pointless ARM __iomem churn.
sh: Wire up kcmp syscall.
UAPI: (Scripted) Disintegrate arch/sh/include/asm
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 9be296cf7295..6ee59001d61d 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -530,7 +530,8 @@ static inline int sci_rxd_in(struct uart_port *port) if (s->cfg->port_reg <= 0) return 1; - return !!__raw_readb(s->cfg->port_reg); + /* Cast for ARM damage */ + return !!__raw_readb((void __iomem *)s->cfg->port_reg); } /* ********************************************************************** * |