summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-17 08:43:40 -0500
committerTom Rini <trini@ti.com>2014-11-17 08:43:40 -0500
commitbdf790fabc8185112b3f699c8a25aab09c50239e (patch)
tree1ad02576f6849a800905eb47ccf4a878c5bfa6d1 /drivers
parent256d83cd6d8caf345ffba414a0f77f30d68caf8a (diff)
parent570dd7f441c2d2d2e83a9345608801c92e7d2c6f (diff)
downloadblackbird-obmc-uboot-bdf790fabc8185112b3f699c8a25aab09c50239e.tar.gz
blackbird-obmc-uboot-bdf790fabc8185112b3f699c8a25aab09c50239e.zip
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/serial_sh.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/serial_sh.h b/drivers/serial/serial_sh.h
index 53406e5855..ef88c8f273 100644
--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -433,7 +433,7 @@ static inline void sci_##name##_out(struct uart_port *port,\
SCI_OUT(sci_size, sci_offset, value);\
}
-#if defined(CONFIG_SH3) || \
+#if defined(CONFIG_CPU_SH3) || \
defined(CONFIG_ARCH_SH7367) || \
defined(CONFIG_ARCH_SH7377) || \
defined(CONFIG_ARCH_SH7372) || \
OpenPOWER on IntegriCloud