From: Nobuhiro Iwamatsu Date: Wed, 29 Oct 2008 04:34:50 +0000 (+0900) Subject: sh: Change register name SCSPTR to SCSPTR2 X-Git-Tag: v2.6.28-rc3~23^2~8 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aeffd54ad7e3af513c6a0dadda71e6316e5ba230;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Paul Mundt --- diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index 257b2235d12..96cae15db9c 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) #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103) static inline int sci_rxd_in(struct uart_port *port) { - return sci_in(port, SCSPTR)&0x0001 ? 1 : 0; /* SCIF */ + return sci_in(port, SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */ } #elif defined(__H8300H__) || defined(__H8300S__) static inline int sci_rxd_in(struct uart_port *port)