mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'acpi-pci'
* 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
This commit is contained in:
commit
3eb8536846
17 changed files with 99 additions and 31 deletions
|
|
@ -88,7 +88,14 @@ int acpi_pci_link_free_irq(acpi_handle handle);
|
|||
|
||||
struct pci_bus;
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
struct pci_dev *acpi_get_pci_dev(acpi_handle);
|
||||
#else
|
||||
static inline struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Arch-defined function to add a bus to the system */
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@
|
|||
|
||||
/* Kernel specific ACPICA configuration */
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
#define ACPI_PCI_CONFIGURED
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY
|
||||
#define ACPI_REDUCED_HARDWARE 1
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue