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

Commit 5dbbb06c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 3bfa948f on remote branch 

Change-Id: I85fd9831ede7423ceddcebd1942bad791be43e67
parents b68aa9b3 3bfa948f

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -6611,6 +6611,12 @@ F: drivers/hid/ 
F:	include/linux/hid*

F:	include/uapi/linux/hid*



HID PLAYSTATION DRIVER

M:	Roderick Colenbrander <roderick.colenbrander@sony.com>

L:	linux-input@vger.kernel.org

S:	Supported

F:	drivers/hid/hid-playstation.c



HID SENSOR HUB DRIVERS

M:	Jiri Kosina <jikos@kernel.org>

M:	Jonathan Cameron <jic23@kernel.org>

Makefile

+5 −8
Original line number Diff line number Diff line
@@ -581,8 +581,12 @@ KBUILD_MODULES := 
KBUILD_BUILTIN := 1



# If we have only "make modules", don't compile built-in objects.

# When we're building modules with modversions, we need to consider

# the built-in objects during the descend as well, in order to

# make sure the checksums are up to date before we record them.



ifeq ($(MAKECMDGOALS),modules)

  KBUILD_BUILTIN :=

  KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)

endif



# If we have "make <whatever> modules", compile modules
@@ -1385,13 +1389,6 @@ ifdef CONFIG_MODULES 


all: modules



# When we're building modules with modversions, we need to consider

# the built-in objects during the descend as well, in order to

# make sure the checksums are up to date before we record them.

ifdef CONFIG_MODVERSIONS

  KBUILD_BUILTIN := 1

endif



# Build modules

#

# A module can be listed more than once in obj-m resulting in

arch/arm/configs/vendor/msm8937-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ CONFIG_QCOM_CLK_SMD_RPM=y 
CONFIG_SDM_GCC_429W=y

CONFIG_SDM_DEBUGCC_429W=y

CONFIG_CLOCK_CPU_SDM=y

CONFIG_SDM_DEBUGCC_439=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y
@@ -565,7 +566,6 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_SYSMON_QMI_COMM=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_DCC_V2=y

CONFIG_MSM_CORE_HANG_DETECT=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
@@ -573,6 +573,7 @@ CONFIG_QCOM_BUS_SCALING=y 
CONFIG_QCOM_GLINK=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_PM=y

CONFIG_QCOM_DCC=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QTEE_SHM_BRIDGE=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

arch/arm/configs/vendor/msm8937_32go-perf_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ CONFIG_QCOM_CLK_SMD_RPM=y 
CONFIG_SDM_GCC_429W=y

CONFIG_SDM_DEBUGCC_429W=y

CONFIG_CLOCK_CPU_SDM=y

CONFIG_SDM_DEBUGCC_439=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y
@@ -557,13 +558,13 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_SYSMON_QMI_COMM=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_DCC_V2=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_GLINK=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_PM=y

CONFIG_QCOM_DCC=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QTEE_SHM_BRIDGE=y

CONFIG_MEM_SHARE_QMI_SERVICE=y

arch/arm/configs/vendor/msm8937_32go_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -539,6 +539,7 @@ CONFIG_QCOM_CLK_SMD_RPM=y 
CONFIG_SDM_GCC_429W=y

CONFIG_SDM_DEBUGCC_429W=y

CONFIG_CLOCK_CPU_SDM=y

CONFIG_SDM_DEBUGCC_439=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y
@@ -571,7 +572,6 @@ CONFIG_MSM_PIL=y 
CONFIG_MSM_SYSMON_QMI_COMM=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_BOOT_STATS=y

CONFIG_QCOM_DCC_V2=y

CONFIG_MSM_CORE_HANG_DETECT=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
@@ -579,6 +579,7 @@ CONFIG_QCOM_BUS_SCALING=y 
CONFIG_QCOM_GLINK=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_PM=y

CONFIG_QCOM_DCC=y

CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QTEE_SHM_BRIDGE=y

CONFIG_MEM_SHARE_QMI_SERVICE=y