summaryrefslogtreecommitdiff
path: root/include/config_fallbacks.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-12-11 20:47:34 -0500
committerTom Rini <trini@ti.com>2014-12-11 20:47:34 -0500
commita5a58826110eb3da2956c6b3213bd750e166d75c (patch)
tree50d21157a7118c6b2b13e7763452332f2d9b51fd /include/config_fallbacks.h
parentfc9b0b80435cda721fbdbe507c9e4f388b0ea62b (diff)
parentb0e6ef46405353270595ffa35c21f4334c541189 (diff)
downloadu-boot-imx-a5a58826110eb3da2956c6b3213bd750e166d75c.zip
u-boot-imx-a5a58826110eb3da2956c6b3213bd750e166d75c.tar.gz
u-boot-imx-a5a58826110eb3da2956c6b3213bd750e166d75c.tar.bz2
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include/config_fallbacks.h')
-rw-r--r--include/config_fallbacks.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index 508db56..ddfe045 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -91,4 +91,10 @@
#undef CONFIG_IMAGE_FORMAT_LEGACY
#endif
+#ifdef CONFIG_DM_I2C
+# ifdef CONFIG_SYS_I2C
+# error "Cannot define CONFIG_SYS_I2C when CONFIG_DM_I2C is used"
+# endif
+#endif
+
#endif /* __CONFIG_FALLBACKS_H */