diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-02 23:35:53 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-02 23:35:53 +0300 |
| commit | 8609d8d8da08156fd0bd41bf4122a1b8345feba6 (patch) | |
| tree | 968a4be3182f0b678b3a095288f6c36cd6bec702 /arch/arm/common/Makefile | |
| parent | c427dfa47342d22eb1a42c153b6fe420131c45a0 (diff) | |
| parent | 52bddd7cb59adbc9ce56ebd03ad63936cf7cd1e5 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151002.0
Conflicting files:
drivers/firmware/Makefile
drivers/firmware/qcom_scm-64.c
drivers/mmc/core/Kconfig
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 |