diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-10-15 14:08:48 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-10-15 14:08:48 +0900 |
| commit | 0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb (patch) | |
| tree | c2ba5f76da4ad86538c5fc9a2a410efa094c1e85 /drivers/tty/serial | |
| parent | cf7599322a6052dae7353f6d986eae06dc7759f5 (diff) | |
| download | op-kernel-dev-0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb.zip op-kernel-dev-0dd4d5cbe4c38165dc9b3ad329ebb23f24d74fdb.tar.gz | |
sh: Fix up more fallout from pointless ARM __iomem churn.
It was already pointed out how to fix these cases before the offending
patches were merged, but unsurprisingly, that didn't happen. As this
change is entirely superfluous to begin with, simply shut things up by
casting everything away.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/tty/serial')
| -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 9be296c..6ee5900 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); } /* ********************************************************************** * |
