Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / drivers / bus / Makefile

diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index fcb9f9794a1f575979e466d5a7b72f68dac8057a..ccff007ee7e86a05e496bfa3da081f0a55cc0b6e 100644 (file)
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -17,4 +17,5 @@ obj-$(CONFIG_OMAP_INTERCONNECT)       += omap_l3_smx.o omap_l3_noc.o
 obj-$(CONFIG_OMAP_OCP2SCP)     += omap-ocp2scp.o
 obj-$(CONFIG_SUNXI_RSB)                += sunxi-rsb.o
 obj-$(CONFIG_SIMPLE_PM_BUS)    += simple-pm-bus.o
+obj-$(CONFIG_UNIPHIER_SYSTEM_BUS)      += uniphier-system-bus.o
 obj-$(CONFIG_VEXPRESS_CONFIG)  += vexpress-config.o