diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-19 18:03:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-19 18:03:23 -0700 |
| commit | 30160a82d3cf4e3e9d280bbf40adbb6cdb4066c7 (patch) | |
| tree | 08a55f7fef11a3a0c180ce31c6117cd37a6ad187 /arch | |
| parent | 675ca2f48beb7623f95c5f125bc34eb8a81d1d2a (diff) | |
| parent | f7eceb3ec0c2066608b783283104e9591a28b247 (diff) | |
Merge "defconfig: msm-auto: Add qti can driver support"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/configs/msm-auto-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/msm-auto_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/msm-auto-perf_defconfig b/arch/arm64/configs/msm-auto-perf_defconfig index a8d66b122429..69d857b32c15 100644 --- a/arch/arm64/configs/msm-auto-perf_defconfig +++ b/arch/arm64/configs/msm-auto-perf_defconfig @@ -224,6 +224,7 @@ CONFIG_SOCKEV_NLMCAST=y CONFIG_CAN=y CONFIG_CAN_RH850=y CONFIG_CAN_K61=y +CONFIG_QTI_CAN=y CONFIG_CAN_PEAK_USB=y CONFIG_BT=y CONFIG_MSM_BT_POWER=y diff --git a/arch/arm64/configs/msm-auto_defconfig b/arch/arm64/configs/msm-auto_defconfig index 3a7e60990a81..8be1b84d53c6 100644 --- a/arch/arm64/configs/msm-auto_defconfig +++ b/arch/arm64/configs/msm-auto_defconfig @@ -226,6 +226,7 @@ CONFIG_SOCKEV_NLMCAST=y CONFIG_CAN=y CONFIG_CAN_RH850=y CONFIG_CAN_K61=y +CONFIG_QTI_CAN=y CONFIG_CAN_PEAK_USB=y CONFIG_BT=y CONFIG_MSM_BT_POWER=y |