Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi

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

diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index 436bbccf4894bdc21e68bbd0329721d40aac02a3..8947bdd0de8bb2c0fdfc918e8dc9d166b6af81fa 100644 (file)
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -8,3 +8,5 @@ obj-$(CONFIG_OMAP_OCP2SCP)      += omap-ocp2scp.o
 
 # Interconnect bus driver for OMAP SoCs.
 obj-$(CONFIG_OMAP_INTERCONNECT)        += omap_l3_smx.o omap_l3_noc.o
+# CCI cache coherent interconnect for ARM platforms
+obj-$(CONFIG_ARM_CCI)          += arm-cci.o