summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2020-12-13 21:03:58 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2020-12-13 21:03:58 -0800
commit2a76e7b903b8d8d7149af0bd497506cd51881f8b (patch)
tree1710eea93839644712328ec0b00c1a1d3e42ae81
parent254f50d07d80fd886e59404d6af71d837aac15d6 (diff)
parenteeec266a93b5f36dbb635e89df4311acb4b03a03 (diff)
Merge "defconfig: Enable CONFIG_HID_NINTENDO for msm8998" into kernel.lnx.4.4.r44-rel
-rw-r--r--arch/arm64/configs/msmcortex-perf_defconfig1
-rw-r--r--arch/arm64/configs/msmcortex_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/msmcortex-perf_defconfig b/arch/arm64/configs/msmcortex-perf_defconfig
index 99851afe2188..c98953b95f9f 100644
--- a/arch/arm64/configs/msmcortex-perf_defconfig
+++ b/arch/arm64/configs/msmcortex-perf_defconfig
@@ -449,6 +449,7 @@ CONFIG_HID_ELECOM=y
CONFIG_HID_MAGICMOUSE=y
CONFIG_HID_MICROSOFT=y
CONFIG_HID_MULTITOUCH=y
+CONFIG_HID_NINTENDO=y
CONFIG_HID_PLANTRONICS=y
CONFIG_HID_SONY=y
CONFIG_USB=y
diff --git a/arch/arm64/configs/msmcortex_defconfig b/arch/arm64/configs/msmcortex_defconfig
index 38d18b69d67a..81e70f0e42e0 100644
--- a/arch/arm64/configs/msmcortex_defconfig
+++ b/arch/arm64/configs/msmcortex_defconfig
@@ -456,6 +456,7 @@ CONFIG_HID_ELECOM=y
CONFIG_HID_MAGICMOUSE=y
CONFIG_HID_MICROSOFT=y
CONFIG_HID_MULTITOUCH=y
+CONFIG_HID_NINTENDO=y
CONFIG_HID_PLANTRONICS=y
CONFIG_HID_SONY=y
CONFIG_USB=y