projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next'
[platform/kernel/u-boot.git]
/
include
/
config_fallbacks.h
diff --git
a/include/config_fallbacks.h
b/include/config_fallbacks.h
index
508db56
..
ddfe045
100644
(file)
--- 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 */