aboutsummaryrefslogtreecommitdiff
path: root/drivers/bus/Makefile
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-05-09 14:06:54 +0100
committerJon Medhurst <tixy@linaro.org>2013-05-09 14:06:54 +0100
commitf011e7c8fbf1350cf87054c0a1617523f08e67a6 (patch)
treef99e2aceb671d4abedde5b6ee2a368d7e792a6e4 /drivers/bus/Makefile
parent0be921c23c74a211cf9cf01cbf654fcb796c1a2e (diff)
parent202df162269cdb0a6f5bac1e5a6e9b0e7d550ff4 (diff)
downloadvexpress-lsk-f011e7c8fbf1350cf87054c0a1617523f08e67a6.tar.gz
Merge branch 'tracking-armlt-cci' into lsk-3.9-vexpress
Diffstat (limited to 'drivers/bus/Makefile')
-rw-r--r--drivers/bus/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index 45d997c8545..55aac809e5b 100644
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -6,3 +6,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
+
+obj-$(CONFIG_ARM_CCI) += arm-cci.o