diff options
| author | Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> | 2008-10-29 00:34:50 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 03:02:42 -0400 |
| commit | aeffd54ad7e3af513c6a0dadda71e6316e5ba230 (patch) | |
| tree | f642a0c180d6506b8e26790a3b28d461e1473081 /drivers/serial | |
| parent | 140626673289a25f677fb006fafb3f6a95b8eb97 (diff) | |
sh: Change register name SCSPTR to SCSPTR2
This change a name of SCSPTR used in sci_rxd_in of SH5-101.
SCSPTR is not declared and will become the error.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sh-sci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 257b2235d126..96cae15db9ca 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h | |||
| @@ -599,7 +599,7 @@ static inline int sci_rxd_in(struct uart_port *port) | |||
| 599 | #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103) | 599 | #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103) |
| 600 | static inline int sci_rxd_in(struct uart_port *port) | 600 | static inline int sci_rxd_in(struct uart_port *port) |
| 601 | { | 601 | { |
| 602 | return sci_in(port, SCSPTR)&0x0001 ? 1 : 0; /* SCIF */ | 602 | return sci_in(port, SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */ |
| 603 | } | 603 | } |
| 604 | #elif defined(__H8300H__) || defined(__H8300S__) | 604 | #elif defined(__H8300H__) || defined(__H8300S__) |
| 605 | static inline int sci_rxd_in(struct uart_port *port) | 605 | static inline int sci_rxd_in(struct uart_port *port) |