Merge branches 'acpi-ec' and 'acpi-x86'
* acpi-ec: ACPI: EC: Fix up fast path check in acpi_ec_add() * acpi-x86: ACPI, x86/boot: make acpi_nobgrt static
This commit is contained in:
@@ -45,7 +45,7 @@ EXPORT_SYMBOL(acpi_disabled);
|
||||
#define PREFIX "ACPI: "
|
||||
|
||||
int acpi_noirq; /* skip ACPI IRQ initialization */
|
||||
int acpi_nobgrt; /* skip ACPI BGRT */
|
||||
static int acpi_nobgrt; /* skip ACPI BGRT */
|
||||
int acpi_pci_disabled; /* skip ACPI PCI scan and IRQ initialization */
|
||||
EXPORT_SYMBOL(acpi_pci_disabled);
|
||||
|
||||
|
Reference in New Issue
Block a user