Merge "Merge android-4.4.162 (3eb8e73) into msm-4.4" (0fd6f3e2) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/devicetree/bindings/net/macb.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ Required properties:
		Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
		the Cadence GEM, or the generic form: "cdns,gem".
		Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
		Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
		Use "cdns,zynqmp-gem" for Zynq Ultrascale+ MPSoC.

+0 −5

Original line number	Diff line number	Diff line
		@@ -977,11 +977,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		See Documentation/x86/intel_mpx.txt for more
		information about the feature.

		eagerfpu= [X86]
		on enable eager fpu restore
		off disable eager fpu restore
		auto selects the default scheme, which automatically
		enables eagerfpu restore for xsaveopt.

		module.async_probe [KNL]
		Enable asynchronous probe on this module.

+1 −1

+0 −14

Original line number	Diff line number	Diff line
		@@ -18,20 +18,6 @@ cflags-y += -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__
		cflags-$(CONFIG_ISA_ARCOMPACT) += -mA7
		cflags-$(CONFIG_ISA_ARCV2) += -mcpu=archs

		is_700 = $(shell $(CC) -dM -E - < /dev/null \| grep -q "ARC700" && echo 1 \|\| echo 0)

		ifdef CONFIG_ISA_ARCOMPACT
		ifeq ($(is_700), 0)
		$(error Toolchain not configured for ARCompact builds)
		endif
		endif

		ifdef CONFIG_ISA_ARCV2
		ifeq ($(is_700), 1)
		$(error Toolchain not configured for ARCv2 builds)
		endif
		endif

		ifdef CONFIG_ARC_CURR_IN_REG
		# For a global register defintion, make sure it gets passed to every file
		# We had a customer reported bug where some code built in kernel was NOT using

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		};

		macb1: ethernet@f802c000 {
		compatible = "cdns,at91sam9260-macb", "cdns,macb";
		compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";
		reg = <0xf802c000 0x100>;
		interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;
		pinctrl-names = "default";