summaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2018-02-16 13:56:02 -0500
committerTom Rini <[email protected]>2018-02-16 13:56:02 -0500
commitbd650cd404b6dc870b6cc220025f35da4b31d0f4 (patch)
tree5082c02c7320fe0410624ccd1d9d6628905ca9df /drivers/serial
parent7961b9f6db19d039b4e6e9c21a9715b6d5b92393 (diff)
parent5b6ae550a8d88ca8c7b5c39642fe767729422edb (diff)
Merge git://git.denx.de/u-boot-sh
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/serial_sh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_sh.c b/drivers/serial/serial_sh.c
index c07ddc70dc8..a17698f90ee 100644
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -149,7 +149,7 @@ static int sh_serial_getc_generic(struct uart_port *port)
return ch;
}
-#ifdef CONFIG_DM_SERIAL
+#if CONFIG_IS_ENABLED(DM_SERIAL)
static int sh_serial_pending(struct udevice *dev, bool input)
{
@@ -204,7 +204,7 @@ static const struct dm_serial_ops sh_serial_ops = {
.setbrg = sh_serial_setbrg,
};
-#ifdef CONFIG_OF_CONTROL
+#if CONFIG_IS_ENABLED(OF_CONTROL)
static const struct udevice_id sh_serial_id[] ={
{.compatible = "renesas,sci", .data = PORT_SCI},
{.compatible = "renesas,scif", .data = PORT_SCIF},