---
 arch/ia64/pci/pci.c                |    6 +-----
 drivers/acpi/internal.h            |    4 ----
 drivers/acpi/scan.c                |   10 +---------
 drivers/pci/hotplug/acpiphp_glue.c |   35 +++--------------------------------
 drivers/pci/pci-acpi.c             |    8 --------
 5 files changed, 5 insertions(+), 58 deletions(-)

Index: linux-2.6/arch/ia64/pci/pci.c
===================================================================
--- linux-2.6.orig/arch/ia64/pci/pci.c
+++ linux-2.6/arch/ia64/pci/pci.c
@@ -393,9 +393,6 @@ out1:
 	return NULL;
 }
 
-<<<<<<< HEAD
-static int is_valid_resource(struct pci_dev *dev, int idx)
-=======
 int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
 {
 	struct pci_controller *controller = bridge->bus->sysdata;
@@ -404,8 +401,7 @@ int pcibios_root_bridge_prepare(struct p
 	return 0;
 }
 
-static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
->>>>>>> pci/next
+static int is_valid_resource(struct pci_dev *dev, int idx)
 {
 	unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;
 	struct resource *devr = &dev->resource[idx], *busr;
Index: linux-2.6/drivers/acpi/internal.h
===================================================================
--- linux-2.6.orig/drivers/acpi/internal.h
+++ linux-2.6/drivers/acpi/internal.h
@@ -94,16 +94,12 @@ struct acpi_ec {
 
 extern struct acpi_ec *first_ec;
 
-<<<<<<< HEAD
-=======
 #ifdef	CONFIG_ACPI_PCI_SLOT
 void acpi_pci_slot_init(void);
 #else
 static inline void acpi_pci_slot_init(void) { }
 #endif
-int acpi_pci_root_init(void);
 void acpi_pci_root_hp_init(void);
->>>>>>> pci/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
@@ -1779,14 +1779,11 @@ int __init acpi_scan_init(void)
 	}
 
 	acpi_pci_root_init();
-<<<<<<< HEAD
 	acpi_pci_link_init();
 	acpi_platform_init();
 	acpi_csrt_init();
 	acpi_container_init();
-=======
 	acpi_pci_slot_init();
->>>>>>> pci/next
 
 	mutex_lock(&acpi_scan_lock);
 	/*
@@ -1808,13 +1805,8 @@ int __init acpi_scan_init(void)
 
 	acpi_update_all_gpes();
 
-<<<<<<< HEAD
+	acpi_pci_root_hp_init();
  out:
 	mutex_unlock(&acpi_scan_lock);
 	return result;
-=======
-	acpi_pci_root_hp_init();
-
-	return 0;
->>>>>>> pci/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;
-	}
-=======
-	bridge = (struct acpiphp_bridge *)hp_work->context;
->>>>>>> pci/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();
-=======
->>>>>>> pci/next
 	kfree(hp_work); /* allocated in handle_hotplug_event_bridge */
 }
 
@@ -1258,15 +1234,10 @@ static void _handle_hotplug_event_func(s
 	type = hp_work->type;
 	func = (struct acpiphp_func *)hp_work->context;
 
-	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
-
-<<<<<<< HEAD
-	func = (struct acpiphp_func *)context;
-
 	acpi_scan_lock_acquire();
 
-=======
->>>>>>> pci/next
+	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+
 	switch (type) {
 	case ACPI_NOTIFY_BUS_CHECK:
 		/* bus re-enumerate */
Index: linux-2.6/drivers/pci/pci-acpi.c
===================================================================
--- linux-2.6.orig/drivers/pci/pci-acpi.c
+++ linux-2.6/drivers/pci/pci-acpi.c
@@ -329,14 +329,6 @@ static void pci_acpi_cleanup(struct devi
 		device_set_run_wake(dev, false);
 		pci_acpi_remove_pm_notifier(adev);
 	}
-<<<<<<< HEAD
-
-	if (pci_dev->subordinate)
-		acpi_pci_irq_del_prt(pci_domain_nr(pci_dev->bus),
-				     pci_dev->subordinate->number);
-=======
-	acpi_power_resource_unregister_device(dev, handle);
->>>>>>> pci/next
 }
 
 static struct acpi_bus_type acpi_pci_bus = {