Merge branch 'topic/dw' into for-linus (11b73fcf) · Commits · 戴 / test

drivers/dma/dw/platform.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -284,6 +284,8 @@ MODULE_DEVICE_TABLE(of, dw_dma_of_id_table);
	#ifdef CONFIG_ACPI		#ifdef CONFIG_ACPI
	static const struct acpi_device_id dw_dma_acpi_id_table[] = {		static const struct acpi_device_id dw_dma_acpi_id_table[] = {
	{ "INTL9C60", 0 },		{ "INTL9C60", 0 },
			{ "80862286", 0 },
			{ "808622C0", 0 },
	{ }		{ }
	};		};
	MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table);		MODULE_DEVICE_TABLE(acpi, dw_dma_acpi_id_table);