Merge branches 'acpi-video' and 'acpi-blacklist' (75fa7d28) · Commits · 戴 / test

drivers/acpi/blacklist.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"),
		},
		},
		{
		.callback = dmi_disable_osi_win8,
		.ident = "Dell Inspiron 7737",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7737"),
		},
		},

		/*
		* BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
		@@ -374,6 +382,19 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T500"),
		},
		},
		/*
		* Without this this EEEpc exports a non working WMI interface, with
		* this it exports a working "good old" eeepc_laptop interface, fixing
		* both brightness control, and rfkill not working.
		*/
		{
		.callback = dmi_enable_osi_linux,
		.ident = "Asus EEE PC 1015PX",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer INC."),
		DMI_MATCH(DMI_PRODUCT_NAME, "1015PX"),
		},
		},
		{}
		};

+19 −3

Original line number	Diff line number	Diff line
		@@ -457,10 +457,10 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
		},
		{
		.callback = video_set_use_native_backlight,
		.ident = "ThinkPad T430s",
		.ident = "ThinkPad T430 and T430s",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430s"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T430"),
		},
		},
		{
		@@ -471,6 +471,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X230"),
		},
		},
		{
		.callback = video_set_use_native_backlight,
		.ident = "ThinkPad T530",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T530"),
		},
		},
		{
		.callback = video_set_use_native_backlight,
		.ident = "ThinkPad X1 Carbon",
		@@ -500,7 +508,7 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
		.ident = "Dell Inspiron 7520",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
		DMI_MATCH(DMI_PRODUCT_VERSION, "Inspiron 7520"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7520"),
		},
		},
		{
		@@ -511,6 +519,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5733Z"),
		},
		},
		{
		.callback = video_set_use_native_backlight,
		.ident = "Acer Aspire 5742G",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5742G"),
		},
		},
		{
		.callback = video_set_use_native_backlight,
		.ident = "Acer Aspire V5-431",