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

Commit a792a470 authored Sep 04, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Sep 04, 2018

Merge "defconfig: msm8909w: Change to use input FF haptics driver"

parents c51f11c5 631f137a

arch/arm/configs/msm8909w-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -262,6 +262,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y
		CONFIG_TOUCHSCREEN_FTS=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_QTI_HAPTICS=y
		CONFIG_INPUT_UINPUT=y
		# CONFIG_DEVMEM is not set
		# CONFIG_DEVKMEM is not set
		@@ -372,7 +373,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
		CONFIG_MMC_SDHCI_MSM=y
		CONFIG_NEW_LEDS=y
		CONFIG_LEDS_CLASS=y
		CONFIG_LEDS_QPNP_HAPTICS=y
		CONFIG_LEDS_TRIGGERS=y
		CONFIG_RTC_CLASS=y
		CONFIG_RTC_DRV_QPNP=y

arch/arm/configs/msm8909w_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -251,6 +251,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v26=y
		CONFIG_TOUCHSCREEN_FTS=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_QPNP_POWER_ON=y
		CONFIG_INPUT_QTI_HAPTICS=y
		CONFIG_INPUT_UINPUT=y
		# CONFIG_DEVMEM is not set
		# CONFIG_DEVKMEM is not set
		@@ -364,7 +365,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
		CONFIG_MMC_SDHCI_MSM=y
		CONFIG_NEW_LEDS=y
		CONFIG_LEDS_CLASS=y
		CONFIG_LEDS_QPNP_HAPTICS=y
		CONFIG_LEDS_TRIGGERS=y
		CONFIG_RTC_CLASS=y
		CONFIG_RTC_DRV_QPNP=y