Commit 1868d192 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These add new ACPI IRQ override and backlight detection quirks.

  Specifics:

   - Add backlight=native DMI quirk for Acer Aspire 3830TG to the ACPI
     backlight driver (Hans de Goede)

   - Add an ACPI IRQ override quirk for Medion S17413 (Aymeric Wibo)"

* tag 'acpi-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: resource: Add Medion S17413 to IRQ override quirk
  ACPI: video: Add backlight=native DMI quirk for Acer Aspire 3830TG
parents cb7f5b41 8dbfa057

drivers/acpi/resource.c

+7 −0
Original line number Diff line number Diff line
@@ -400,6 +400,13 @@ static const struct dmi_system_id medion_laptop[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "M17T"),

		},

	},

	{

		.ident = "MEDION S17413",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),

			DMI_MATCH(DMI_BOARD_NAME, "M1xA"),

		},

	},

	{ }

};

drivers/acpi/video_detect.c

+8 −0
Original line number Diff line number Diff line
@@ -495,6 +495,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "Precision 7510"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Acer Aspire 3830TG */

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3830TG"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 /* Acer Aspire 4810T */