Merge "Merge android-4.4.186 (aeb051d) into msm-4.4" (6876dc0e) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ Required properties:
		- compatible: Should be one of the following:
		- "microchip,mcp2510" for MCP2510.
		- "microchip,mcp2515" for MCP2515.
		- "microchip,mcp25625" for MCP25625.
		- reg: SPI chip select.
		- clocks: The clock feeding the CAN controller.
		- interrupt-parent: The parent interrupt controller.

+1 −1

+4 −5

Original line number	Diff line number	Diff line
		@@ -183,11 +183,6 @@ static void *__init unw_hdr_alloc_early(unsigned long sz)
		MAX_DMA_ADDRESS);
		}

		static void *unw_hdr_alloc(unsigned long sz)
		{
		return kmalloc(sz, GFP_KERNEL);
		}

		static void init_unwind_table(struct unwind_table table, const char name,
		const void *core_start, unsigned long core_size,
		const void *init_start, unsigned long init_size,
		@@ -368,6 +363,10 @@ ret_err:
		}

		#ifdef CONFIG_MODULES
		static void *unw_hdr_alloc(unsigned long sz)
		{
		return kmalloc(sz, GFP_KERNEL);
		}

		static struct unwind_table *last_table;

+2 −0

Original line number	Diff line number	Diff line
		@@ -1479,6 +1479,8 @@ static __init void da850_evm_init(void)
		if (ret)
		pr_warn("%s: dsp/rproc registration failed: %d\n",
		__func__, ret);

		regulator_has_full_constraints();
		}

		#ifdef CONFIG_SERIAL_8250_CONSOLE

+3 −0

Original line number	Diff line number	Diff line
		@@ -660,6 +660,9 @@ static struct platform_device da8xx_lcdc_device = {
		.id = 0,
		.num_resources = ARRAY_SIZE(da8xx_lcdc_resources),
		.resource = da8xx_lcdc_resources,
		.dev = {
		.coherent_dma_mask = DMA_BIT_MASK(32),
		}
		};

		int __init da8xx_register_lcdc(struct da8xx_lcdc_platform_data *pdata)