Merge remote-tracking branch 'regmap/fix/rbtree' into regmap-linus

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 580a5320cc96afd21807cddaaa40bdff47694d5d..6d91fcb4c5cb9dec57a043282150895d567f2601 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -16,6 +16,7 @@
 #include <linux/list.h>
 #include <linux/rbtree.h>
 #include <linux/err.h>
+#include <linux/bug.h>
 
 struct module;
 struct device;