summaryrefslogtreecommitdiff
path: root/arch/arm/common/Kconfig
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2015-11-12 19:58:56 +0300
committerAndrey Konovalov <andrey.konovalov@linaro.org>2015-11-12 19:58:56 +0300
commitf85bb96a52f47a016aa5b67a9eff0c7f19a5b64c (patch)
tree0618209975b2807c01b18d384ded4f8342abe3a9 /arch/arm/common/Kconfig
parentd4e209db57abe07163fe84b43b533a4b6246b0c3 (diff)
parent0faf49393534fa4263bfbda7d0566e2e3d1aaf37 (diff)
downloadlinux-linaro-tracking-f85bb96a52f47a016aa5b67a9eff0c7f19a5b64c.tar.gz
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151112.0ll_20151112.0
Conflicting files:
Diffstat (limited to 'arch/arm/common/Kconfig')
-rw-r--r--arch/arm/common/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index f4a38a76db64..6c9fa6bd7eae 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -9,6 +9,9 @@ config DMABOUNCE
bool
select ZONE_DMA
+config KRAIT_L2_ACCESSORS
+ bool
+
config SHARP_LOCOMO
bool