[lkml]   [2013]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the pm tree with the pci tree
Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/internal.h between commits 668192b67820 ("PCI: acpiphp: Move
host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI: Make
pci_slot built-in only, not a module") from the pci tree and commit
00c43b968250 ("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).

Stephen Rothwell

diff --cc drivers/acpi/internal.h
index e09ce03,7909232..0000000
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -67,13 -94,6 +94,12 @@@ struct acpi_ec

extern struct acpi_ec *first_ec;

+void acpi_pci_slot_init(void);
+static inline void acpi_pci_slot_init(void) { }
- 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);
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2013-02-18 02:21    [W:0.026 / U:0.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site