Change order of includes to avoid conflict with nrfx/npmx compiler_abstraction.h

Signed-off-by: Audun Korneliussen <audun.korneliussen@nordicsemi.no>

Author: nordic-auko

drivers/npmx/npmx_driver.c

@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <npmx_core.h>
-#include <npmx_driver.h>
 
 #include <zephyr/types.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/sys/byteorder.h>
 
+#include <npmx_core.h>
+#include <npmx_driver.h>
+
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(NPMX, CONFIG_NPMX_LOG_LEVEL);
 

drivers/npmx/shell/ldsw.c

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "npmx_common.h"
 #include "shell_common.h"
+#include "npmx_common.h"
 #include <npmx_driver.h>
 
 /** @brief Load switch GPIO configuration parameter. */

drivers/npmx/shell/shell_common.h

@@ -7,10 +7,11 @@
 #ifndef ZEPHYR_DRIVERS_SHELL_COMMON_H__
 #define ZEPHYR_DRIVERS_SHELL_COMMON_H__
 
+#include <zephyr/shell/shell.h>
+
 #include <npmx.h>
 #include <npmx_adc.h>
 #include <npmx_charger.h>
-#include <zephyr/shell/shell.h>
 
 /** @brief Max supported number of shell arguments. */
 #define SHELL_ARG_MAX_COUNT 3U