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

Commit 3225a4fe authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19-q.78 (d9e388f8) into msm-4.19"

parents 915c865b fb05bd72

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 76

SUBLEVEL = 78

EXTRAVERSION =

NAME = "People's Front"

arch/arm/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -1586,8 +1586,9 @@ config ARM_PATCH_IDIV 
	  code to do integer division.



config AEABI

	bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && !CPU_V7M && !CPU_V6 && !CPU_V6K

	default CPU_V7 || CPU_V7M || CPU_V6 || CPU_V6K

	bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && \

		!CPU_V7M && !CPU_V6 && !CPU_V6K && !CC_IS_CLANG

	default CPU_V7 || CPU_V7M || CPU_V6 || CPU_V6K || CC_IS_CLANG

	help

	  This option allows for the kernel to be compiled using the latest

	  ARM ABI (aka EABI).  This is only useful if you are using a user

arch/arm/boot/dts/exynos5420-peach-pit.dts

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ 
				regulator-name = "vdd_ldo10";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

arch/arm/boot/dts/exynos5800-peach-pi.dts

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ 
				regulator-name = "vdd_ldo10";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				regulator-state-mem {

					regulator-off-in-suspend;

				};

arch/arm/boot/dts/imx7-colibri.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ 
	vmmc-supply = <&reg_module_3v3>;

	vqmmc-supply = <&reg_DCDC3>;

	non-removable;

	sdhci-caps-mask = <0x80000000 0x0>;

};



&iomuxc {