Merge tag 'for-linus-20150623' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / include / linux / mbus.h

diff --git a/include/linux/mbus.h b/include/linux/mbus.h
index 611b69fa85941ebae8d4f61ab61221a469e1c079..1f7bc630d2252618ea940e75675cc39013b052fb 100644 (file)
--- a/include/linux/mbus.h
+++ b/include/linux/mbus.h
@@ -54,11 +54,16 @@ struct mbus_dram_target_info
  */
 #ifdef CONFIG_PLAT_ORION
 extern const struct mbus_dram_target_info *mv_mbus_dram_info(void);
+extern const struct mbus_dram_target_info *mv_mbus_dram_info_nooverlap(void);
 #else
 static inline const struct mbus_dram_target_info *mv_mbus_dram_info(void)
 {
        return NULL;
 }
+static inline const struct mbus_dram_target_info *mv_mbus_dram_info_nooverlap(void)
+{
+       return NULL;
+}
 #endif
 
 int mvebu_mbus_save_cpu_target(u32 *store_addr);