Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d935402 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull last-minute ACPI fix from Rafael Wysocki:
 "This reverts a commit that causes the Alan Cox' ASUS T100TA to "crash
  and burn" during boot if the Baytrail pinctrl driver is compiled in"

* tag 'acpi-3.13-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs"
parents 16ec54ad 2b844ba7

drivers/acpi/acpi_lpss.c

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { 
	{ "80860F14", (unsigned long)&byt_sdio_dev_desc },

	{ "80860F41", (unsigned long)&byt_i2c_dev_desc },

	{ "INT33B2", },

	{ "INT33FC", },



	{ "INT3430", (unsigned long)&lpt_dev_desc },

	{ "INT3431", (unsigned long)&lpt_dev_desc },

drivers/pinctrl/pinctrl-baytrail.c

+0 −1
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ static const struct dev_pm_ops byt_gpio_pm_ops = { 


static const struct acpi_device_id byt_gpio_acpi_match[] = {

	{ "INT33B2", 0 },

	{ "INT33FC", 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, byt_gpio_acpi_match);