diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-18 16:46:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-18 16:46:29 +0100 |
| commit | 9bca3d7f7c5865700303e8bce0eac57bab76bcc7 (patch) | |
| tree | 2e31b6d77ab5d206e5cada5590100150774cf3f9 /drivers/bus/Makefile | |
| parent | 38b52683569174d95efcb60edfb4985be0e023b5 (diff) | |
| parent | dc2ed0827570f07ab496e9742d48eaaac07e4ff8 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
Conflicts (look like simple add/add stuff):
arch/arm/Kconfig
arch/arm/common/Makefile
Diffstat (limited to 'drivers/bus/Makefile')
| -rw-r--r-- | drivers/bus/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index 3c7b53c12091..670cea443802 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -7,3 +7,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 |