diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-25 12:55:17 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-25 12:55:17 +0800 |
| commit | 068e31608ab2e664dce897343a3e5d43c4f023e3 (patch) | |
| tree | 8f3cb76ede9e94d1abe48d3f94f627bb8864272f /arch/arm64 | |
| parent | 662d618b983cd0566a1cc2ed28c09a0a4b07b9f3 (diff) | |
| parent | 5497d2d7d543b4b8854700d47a175e157fecbfd1 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
drivers/usb/gadget/function/u_ether.c
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index bdd7aa358d2a..79717faf2161 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -225,3 +225,6 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_CRYPTO_CRC32_ARM64=y +CONFIG_HIBERNATION=y +CONFIG_KPROBES=y +CONFIG_CORESIGHT=y |