Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e101dfd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable CONFIG_HID_SONY for SDM439 and SDM632"

parents c021a2ce ea1b6ccf

arch/arm/configs/msm8937-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,6 @@ CONFIG_GPIO_QPNP_PIN=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1360_CHARGER_FG=y
@@ -455,6 +454,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

arch/arm/configs/msm8937_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ CONFIG_GPIO_QPNP_PIN=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1360_CHARGER_FG=y
@@ -464,6 +463,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

arch/arm/configs/msm8953-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ CONFIG_GPIO_QPNP_PIN=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y
@@ -454,6 +453,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

arch/arm/configs/msm8953_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,6 @@ CONFIG_GPIO_QPNP_PIN=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y
@@ -462,6 +461,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

arch/arm64/configs/msm8937-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y