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

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

Merge "Merge android-4.4@9f764bb (v4.4.80) into msm-4.4"

parents 5883338f 899e6b96

Makefile

+4 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 78

SUBLEVEL = 80

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -623,6 +623,9 @@ include arch/$(SRCARCH)/Makefile 
KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)

KBUILD_CFLAGS	+= $(call cc-disable-warning,maybe-uninitialized,)

KBUILD_CFLAGS	+= $(call cc-disable-warning,frame-address,)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os

arch/arm/boot/dts/omap3-n900.dts

+2 −0
Original line number Diff line number Diff line
@@ -697,6 +697,8 @@ 
	vmmc_aux-supply = <&vsim>;

	bus-width = <8>;

	non-removable;

	no-sdio;

	no-sd;

};



&mmc3 {

arch/arm/configs/s3c2410_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ CONFIG_IPV6_TUNNEL=m 
CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CT_PROTO_DCCP=m

CONFIG_NF_CT_PROTO_SCTP=m

CONFIG_NF_CT_PROTO_UDPLITE=m

CONFIG_NF_CT_PROTO_DCCP=y

CONFIG_NF_CT_PROTO_SCTP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=m

CONFIG_NF_CONNTRACK_FTP=m

CONFIG_NF_CONNTRACK_H323=m

arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
		stdout-path = "serial0:115200n8";

	};



	memory {

	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x40000000>;

	};

arch/arm64/boot/dts/xilinx/zynqmp.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
			     <1 10 0xf01>;

	};



	amba_apu {

	amba_apu: amba_apu@0 {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <1>;
@@ -191,7 +191,7 @@ 
		};



		i2c0: i2c@ff020000 {

			compatible = "cdns,i2c-r1p10";

			compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";

			status = "disabled";

			interrupt-parent = <&gic>;

			interrupts = <0 17 4>;
@@ -202,7 +202,7 @@ 
		};



		i2c1: i2c@ff030000 {

			compatible = "cdns,i2c-r1p10";

			compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";

			status = "disabled";

			interrupt-parent = <&gic>;

			interrupts = <0 18 4>;