Merge branches 'acpi-pnp' and 'acpi-blacklist' (dbcbe68b) · Commits · 戴 / test

drivers/acpi/acpi_pnp.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -132,10 +132,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
		{"PNP0401"}, /* ECP Printer Port */
		/* apple-gmux */
		{"APP000B"},
		/* fujitsu-laptop.c */
		{"FUJ02bf"},
		{"FUJ02B1"},
		{"FUJ02E3"},
		/* system */
		{"PNP0c02"}, /* General ID for reserving resources */
		{"PNP0c01"}, /* memory controller */

+34 −2

Original line number	Diff line number	Diff line
		@@ -247,8 +247,8 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		},

		/*
		* These machines will power on immediately after shutdown when
		* reporting the Windows 2012 OSI.
		* The wireless hotkey does not work on those machines when
		* returning true for _OSI("Windows 2012")
		*/
		{
		.callback = dmi_disable_osi_win8,
		@@ -258,6 +258,38 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7737"),
		},
		},
		{
		.callback = dmi_disable_osi_win8,
		.ident = "Dell Inspiron 7537",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7537"),
		},
		},
		{
		.callback = dmi_disable_osi_win8,
		.ident = "Dell Inspiron 5437",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5437"),
		},
		},
		{
		.callback = dmi_disable_osi_win8,
		.ident = "Dell Inspiron 3437",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 3437"),
		},
		},
		{
		.callback = dmi_disable_osi_win8,
		.ident = "Dell Vostro 3446",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 3446"),
		},
		},

		/*
		* BIOS invocation of _OSI(Linux) is almost always a BIOS bug.

+7 −9

Original line number	Diff line number	Diff line
		@@ -1050,6 +1050,13 @@ static struct acpi_driver acpi_fujitsu_hotkey_driver = {
		},
		};

		static const struct acpi_device_id fujitsu_ids[] __used = {
		{ACPI_FUJITSU_HID, 0},
		{ACPI_FUJITSU_HOTKEY_HID, 0},
		{"", 0}
		};
		MODULE_DEVICE_TABLE(acpi, fujitsu_ids);

		static int __init fujitsu_init(void)
		{
		int ret, result, max_brightness;
		@@ -1208,12 +1215,3 @@ MODULE_LICENSE("GPL");
		MODULE_ALIAS("dmi::svnFUJITSUSIEMENS::pvr:rvnFUJITSU:rnFJNB1D3::cvrS6410:");
		MODULE_ALIAS("dmi::svnFUJITSUSIEMENS::pvr:rvnFUJITSU:rnFJNB1E6::cvrS6420:");
		MODULE_ALIAS("dmi::svnFUJITSU::pvr:rvnFUJITSU:rnFJNB19C::cvrS7020:");

		static struct pnp_device_id pnp_ids[] __used = {
		{.id = "FUJ02bf"},
		{.id = "FUJ02B1"},
		{.id = "FUJ02E3"},
		{.id = ""}
		};

		MODULE_DEVICE_TABLE(pnp, pnp_ids);