diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-16 20:14:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-16 20:14:19 +0100 |
| commit | 5f856071c77e545f49400e5d7e48ab298d5c57ee (patch) | |
| tree | e56ce05bc098c2a34c698645797872bcf75696d2 /arch/arm64/Makefile | |
| parent | a0f20736440d550d2fca63337c4f368e28a4a1ad (diff) | |
| parent | 581a6bd433c6ec65fdb5b4667258a8b275ae5c96 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-crypto' into linux-linaro-lsk
Conflicts:
arch/arm64/Kconfig
Diffstat (limited to 'arch/arm64/Makefile')
| -rw-r--r-- | arch/arm64/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index a254d2c2c0dc..8f63c8a21b7e 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -43,6 +43,7 @@ TEXT_OFFSET := 0x00080000 export TEXT_OFFSET GZFLAGS core-y += arch/arm64/kernel/ arch/arm64/mm/ +core-$(CONFIG_CRYPTO) += arch/arm64/crypto/ libs-y := arch/arm64/lib/ $(libs-y) libs-y += $(LIBGCC) |