diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-19 13:01:56 +0300 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-19 13:01:56 +0300 |
commit | 4b131c9bf8af9bc7a25441251f60a8ca7fc69c07 (patch) | |
tree | ba0bc4861f2f606b088b09c53389f06e88a69894 /arch/arm/common/Makefile | |
parent | d4e209db57abe07163fe84b43b533a4b6246b0c3 (diff) | |
parent | 08fad54a88981323247c7199ccbb8d42c596466a (diff) |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151119.0linux-linaro-4.3-2015.11
Conflicting files:
Diffstat (limited to 'arch/arm/common/Makefile')
-rw-r--r-- | arch/arm/common/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index 11a42f8bf8a4..263022213664 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_FIQ_GLUE) += fiq_glue.o fiq_glue_setup.o obj-$(CONFIG_ICST) += icst.o obj-$(CONFIG_SA1111) += sa1111.o obj-$(CONFIG_DMABOUNCE) += dmabounce.o +obj-$(CONFIG_KRAIT_L2_ACCESSORS) += krait-l2-accessors.o obj-$(CONFIG_SHARP_LOCOMO) += locomo.o obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o obj-$(CONFIG_SHARP_SCOOP) += scoop.o |