Merge branch 'sfi-base' into release
Conflicts: drivers/acpi/power.c Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
@@ -36,6 +36,8 @@
|
||||
#include <acpi/acpi_bus.h>
|
||||
#include <acpi/acpi_drivers.h>
|
||||
|
||||
#define PREFIX "ACPI: "
|
||||
|
||||
#define _COMPONENT ACPI_PCI_COMPONENT
|
||||
ACPI_MODULE_NAME("pci_root");
|
||||
#define ACPI_PCI_ROOT_CLASS "pci_bridge"
|
||||
|
Reference in New Issue
Block a user