aboutsummaryrefslogtreecommitdiff
path: root/drivers/bus/Kconfig
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-07-17 12:01:50 +0100
committerJon Medhurst <tixy@linaro.org>2013-07-17 12:01:50 +0100
commit95106c3b6742a45828bd675ca55e3e378d6d3071 (patch)
treeb61b339f9a407443bce35d3685320c812ba6c239 /drivers/bus/Kconfig
parentfcd1e5ad6653a951c1b0e945197bcf79a51e1e65 (diff)
parent4311d5a4b599317bc321b1d8b9c0d1f4e49e7df5 (diff)
Merge branch 'tracking-armlt-cci' into lsk-3.10-vexpress
Conflicts: arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
Diffstat (limited to 'drivers/bus/Kconfig')
-rw-r--r--drivers/bus/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index b05ecab915c4..5286e2d333b0 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -26,4 +26,11 @@ config OMAP_INTERCONNECT
help
Driver to enable OMAP interconnect error handling driver.
+
+config ARM_CCI
+ bool "ARM CCI driver support"
+ depends on ARM
+ help
+ Driver supporting the CCI cache coherent interconnect for ARM
+ platforms.
endmenu