---
 drivers/acpi/internal.h            |    4 ----
 drivers/acpi/scan.c                |    4 ----
 drivers/pci/hotplug/acpiphp_glue.c |   29 -----------------------------
 3 files changed, 37 deletions(-)

Index: linux-2.6/drivers/acpi/internal.h
===================================================================
--- linux-2.6.orig/drivers/acpi/internal.h
+++ linux-2.6/drivers/acpi/internal.h
@@ -94,11 +94,7 @@ struct acpi_ec {
 
 extern struct acpi_ec *first_ec;
 
-<<<<<<< HEAD
-int acpi_pci_root_init(void);
 void acpi_pci_root_hp_init(void);
-=======
->>>>>>> pm/linux-next
 int acpi_ec_init(void);
 int acpi_ec_ecdt_probe(void);
 int acpi_boot_ec_enable(void);
Index: linux-2.6/drivers/acpi/scan.c
===================================================================
--- linux-2.6.orig/drivers/acpi/scan.c
+++ linux-2.6/drivers/acpi/scan.c
@@ -1804,13 +1804,9 @@ int __init acpi_scan_init(void)
 
 	acpi_update_all_gpes();
 
-<<<<<<< HEAD
 	acpi_pci_root_hp_init();
 
-	return 0;
-=======
  out:
 	mutex_unlock(&acpi_scan_lock);
 	return result;
->>>>>>> pm/linux-next
 }
Index: linux-2.6/drivers/pci/hotplug/acpiphp_glue.c
===================================================================
--- linux-2.6.orig/drivers/pci/hotplug/acpiphp_glue.c
+++ linux-2.6/drivers/pci/hotplug/acpiphp_glue.c
@@ -1135,30 +1135,10 @@ static void _handle_hotplug_event_bridge
 	hp_work = container_of(work, struct acpi_hp_work, work);
 	handle = hp_work->handle;
 	type = hp_work->type;
-<<<<<<< HEAD
 	bridge = (struct acpiphp_bridge *)hp_work->context;
-=======
 
 	acpi_scan_lock_acquire();
 
-	if (acpi_bus_get_device(handle, &device)) {
-		/* This bridge must have just been physically inserted */
-		handle_bridge_insertion(handle, type);
-		goto out;
-	}
-
-	bridge = acpiphp_handle_to_bridge(handle);
-	if (type == ACPI_NOTIFY_BUS_CHECK) {
-		acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, ACPI_UINT32_MAX,
-			count_sub_bridges, NULL, &num_sub_bridges, NULL);
-	}
-
-	if (!bridge && !num_sub_bridges) {
-		err("cannot get bridge info\n");
-		goto out;
-	}
->>>>>>> pm/linux-next
-
 	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
 	switch (type) {
@@ -1213,11 +1193,7 @@ static void _handle_hotplug_event_bridge
 		break;
 	}
 
-<<<<<<< HEAD
-=======
-out:
 	acpi_scan_lock_release();
->>>>>>> pm/linux-next
 	kfree(hp_work); /* allocated in handle_hotplug_event_bridge */
 }
 
@@ -1260,13 +1236,8 @@ static void _handle_hotplug_event_func(s
 
 	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
-<<<<<<< HEAD
-=======
-	func = (struct acpiphp_func *)context;
-
 	acpi_scan_lock_acquire();
 
->>>>>>> pm/linux-next
 	switch (type) {
 	case ACPI_NOTIFY_BUS_CHECK:
 		/* bus re-enumerate */