Commit: 590e9cd1b34ca70557b3ed5399243fbdc6e3ab64 - device-generic-common (git)

device/generic/common

Commit MetaInfo

• Revision: 590e9cd1b34ca70557b3ed5399243fbdc6e3ab64 (tree)
• Time: 2019-10-15 18:48:47
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

Merge remote-tracking branch 'x86/oreo-x86' into pie-x86

Change Summary

• modified: build/tasks/kernel.mk
• modified: init.sh

Incremental Difference

--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -88,14 +88,6 @@ endif
 
 $(BUILT_SYSTEMIMAGE): $(KERNEL_MODULES_DEP)
 
-# rules to get source of Broadcom 802.11a/b/g/n hybrid device driver
-# based on broadcomsetup.sh of Kyle Evans
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/broadcom/wl
-ifeq ($(wildcard $(WL_PATH)/build.mk),)
-WL_PATH := $(KERNEL_DIR)/drivers/net/wireless/wl
-endif
--include $(WL_PATH)/build.mk
-
 installclean: FILES += $(KBUILD_OUTPUT) $(INSTALLED_KERNEL_TARGET)
 
 TARGET_PREBUILT_KERNEL := $(BUILT_KERNEL_TARGET)

--- a/init.sh
+++ b/init.sh
@@ -321,6 +321,9 @@ function init_hal_sensors()
 			set_property ro.iio.accel.x.opt_scale -1
 			set_property ro.iio.accel.y.opt_scale -1
 			;;
+		*SP111-33*)
+			set_property ro.iio.accel.quirks no-trig
+			;&
 		*ST70416-6*)
 			set_property ro.iio.accel.order 102
 			;;