From 02ae3431004cecf88e1204b3977ab2e0b09bcc1d Mon Sep 17 00:00:00 2001
From: Peter Bigot <peter.bigot@nordicsemi.no>
Date: Sat, 25 Jan 2020 05:35:02 -0600
Subject: [PATCH] treewide: use full path to uart.h header

The build infrastructure should not be adding the drivers subdirectory
to the include path.  Fix the legacy uses that depended on that
addition.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
---
 drivers/serial/uart_xlnx_ps.c      | 2 +-
 samples/net/wpan_serial/src/main.c | 2 +-
 soc/arm/nxp_kinetis/k2x/soc.c      | 2 +-
 subsys/console/getchar.c           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/serial/uart_xlnx_ps.c b/drivers/serial/uart_xlnx_ps.c
index d58c99f9a82..2a2eb282b72 100644
--- a/drivers/serial/uart_xlnx_ps.c
+++ b/drivers/serial/uart_xlnx_ps.c
@@ -29,7 +29,7 @@
 #include <init.h>
 #include <toolchain.h>
 #include <linker/sections.h>
-#include <uart.h>
+#include <drivers/uart.h>
 #include <sys/sys_io.h>
 
 #define XUARTPS_CR_OFFSET	0x0000U  /**< Control Register [8:0] */
diff --git a/samples/net/wpan_serial/src/main.c b/samples/net/wpan_serial/src/main.c
index bf7bce24575..0183f8203f1 100644
--- a/samples/net/wpan_serial/src/main.c
+++ b/samples/net/wpan_serial/src/main.c
@@ -15,7 +15,7 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(wpan_serial, CONFIG_USB_DEVICE_LOG_LEVEL);
 
-#include <uart.h>
+#include <drivers/uart.h>
 #include <zephyr.h>
 
 #include <net/buf.h>
diff --git a/soc/arm/nxp_kinetis/k2x/soc.c b/soc/arm/nxp_kinetis/k2x/soc.c
index 73e7b3f5102..3379c389d0b 100644
--- a/soc/arm/nxp_kinetis/k2x/soc.c
+++ b/soc/arm/nxp_kinetis/k2x/soc.c
@@ -19,7 +19,7 @@
 #include <device.h>
 #include <init.h>
 #include <soc.h>
-#include <uart.h>
+#include <drivers/uart.h>
 #include <fsl_common.h>
 #include <fsl_clock.h>
 #include <arch/cpu.h>
diff --git a/subsys/console/getchar.c b/subsys/console/getchar.c
index 3c53a400f2c..130b47fffa5 100644
--- a/subsys/console/getchar.c
+++ b/subsys/console/getchar.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <console/console.h>
 #include <console/tty.h>
-#include <uart.h>
+#include <drivers/uart.h>
 
 static struct tty_serial console_serial;