From 3a3dbf524b4248832c025d5f988a8216d7d79014 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Fri, 16 Sep 2022 14:10:53 -0500
Subject: [PATCH] zephyr: Update include paths to use the zephyr namespace.

Zephyr v3.1.0 moved all public headers to include/zephyr. Updates a few
Zephyr include paths that were missed in
4fd54a475661953946e9e3c3f962b20619c82240.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/modbluetooth_zephyr.c  | 4 ++--
 ports/zephyr/mpconfigport_minimal.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index b427a6cd9..8947bdf53 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -31,8 +31,8 @@
 
 #if MICROPY_PY_BLUETOOTH
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 #include "extmod/modbluetooth.h"
 
 #define DEBUG_printf(...) // printk("BLE: " __VA_ARGS__)
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index 6c7a4c6b8..d81e007e0 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -28,7 +28,7 @@
 // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
 #include "autoconf.h"
 // Included here to get basic Zephyr environment (macros, etc.)
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE