summaryrefslogtreecommitdiff
path: root/include/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/config.h')
-rw-r--r--include/config.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/config.h b/include/config.h
index f99253b49b..b354956bb5 100644
--- a/include/config.h
+++ b/include/config.h
@@ -2857,10 +2857,15 @@
* Only one of these may be defined (if any).
*/
#ifndef CONFIG_ZEPHYR
+/*
+ * These symbols also exist as Kconfigs in Zephyr. Zephyr based boards
+ * need to use the upstream driver, or these symbols need to be changed
+ * downstream to not conflict.
+ */
#undef CONFIG_INA219
+#undef CONFIG_INA3221
#endif /* CONFIG_ZEPHYR */
#undef CONFIG_INA231
-#undef CONFIG_INA3221
/*****************************************************************************/
/* Inductive charging */