]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cd9da8 5c6a117)
Merge branch 'acpi-pci'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Dec 2018 09:04:23 +0000 (10:04 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Dec 2018 09:04:23 +0000 (10:04 +0100)
* acpi-pci:
  ACPI: Make PCI slot detection driver depend on PCI
  ACPI/IORT: Stub out ACS functions when CONFIG_PCI is not set
  arm64: select ACPI PCI code only when both features are enabled
  PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set
  ACPICA: Remove PCI bits from ACPICA when CONFIG_PCI is unset
  ACPI: Allow CONFIG_PCI to be unset for reboot
  ACPI: Move PCI reset to a separate function

1  2 
drivers/acpi/Kconfig patch | diff1 | diff2 | blob | history
include/linux/acpi.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/Kconfig
Simple merge
diff --cc include/linux/acpi.h
Simple merge
local clone of linux.git