Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/internal.h between commit 668192b67820 ("PCI: acpiphp: Move
host bridge hotplug to pci_root.c") from the pci tree and commit
2c545601d933 ("ACPI / PCI: Make PCI root driver use struct
acpi_scan_handler") from the pm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc drivers/acpi/internal.h
index 0f24148,0d1397d..0000000
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -67,8 -89,6 +89,7 @@@ struct acpi_ec
extern struct acpi_ec *first_ec;
- int acpi_pci_root_init(void);
+void acpi_pci_root_hp_init(void);
int acpi_ec_init(void);
int acpi_ec_ecdt_probe(void);
int acpi_boot_ec_enable(void);
Attachment:
pgp4u1YmGbPfl.pgp
Description: PGP signature
