From: Paul Mundt Date: Sat, 9 May 2009 05:31:37 +0000 (+0900) Subject: sh: Fix up the sh64 earlyprintk build. X-Git-Tag: v2.6.31-rc1~392^2~41^2~52 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9e8b1fb995543c4cc3930f465923a552b2e48b7;p=karo-tx-linux.git sh: Fix up the sh64 earlyprintk build. sci_rxd_in() on SH-5 wants to be using SCSPTR, not SCSPTR2. Signed-off-by: Paul Mundt --- diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index e3eae4eaaddf..38072c15b845 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h @@ -636,7 +636,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, SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */ + return sci_in(port, SCSPTR)&0x0001 ? 1 : 0; /* SCIF */ } #elif defined(__H8300H__) || defined(__H8300S__) static inline int sci_rxd_in(struct uart_port *port)