From 1b67e9d8ed40ccb9d897a505746d7bb0f8c15999 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Wed, 29 Oct 2008 13:34:50 +0900 Subject: [PATCH] --- yaml --- r: 118250 b: refs/heads/master c: aeffd54ad7e3af513c6a0dadda71e6316e5ba230 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/sh-sci.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 31e8da61be3d..de5ae2eac157 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 140626673289a25f677fb006fafb3f6a95b8eb97 +refs/heads/master: aeffd54ad7e3af513c6a0dadda71e6316e5ba230 diff --git a/trunk/drivers/serial/sh-sci.h b/trunk/drivers/serial/sh-sci.h index 257b2235d126..96cae15db9ca 100644 --- a/trunk/drivers/serial/sh-sci.h +++ b/trunk/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)