summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-11-11 09:00:14 +0100
committerPaul Mundt <lethal@linux-sh.org>2011-11-11 09:00:14 +0100
commitf87114e982cf3b657411e2df50e4e42ec1f162dd (patch)
tree16ff1a3f9e975048c5aa30c146bfc5cbc4f04d0c /drivers
parentARM: mach-shmobile: cpuidle single/global and last_state fixes (diff)
parentARM: mach-shmobile: r8a7740: add INTC support (diff)
downloadlinux-f87114e982cf3b657411e2df50e4e42ec1f162dd.tar.xz
linux-f87114e982cf3b657411e2df50e4e42ec1f162dd.zip
Merge branch 'rmobile/a1' into rmobile-latest
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/sh-sci.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h
index e9bed038aa1f..a1a2d364f92b 100644
--- a/drivers/tty/serial/sh-sci.h
+++ b/drivers/tty/serial/sh-sci.h
@@ -17,7 +17,9 @@
defined(CONFIG_ARCH_SH73A0) || \
defined(CONFIG_ARCH_SH7367) || \
defined(CONFIG_ARCH_SH7377) || \
- defined(CONFIG_ARCH_SH7372)
+ defined(CONFIG_ARCH_SH7372) || \
+ defined(CONFIG_ARCH_R8A7740)
+
# define SCxSR_RDxF_CLEAR(port) (sci_in(port, SCxSR) & 0xfffc)
# define SCxSR_ERROR_CLEAR(port) (sci_in(port, SCxSR) & 0xfd73)
# define SCxSR_TDxE_CLEAR(port) (sci_in(port, SCxSR) & 0xffdf)