3 files changed, 10 insertions, 2 deletions

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 526d66384c09..5ce8d5e86734 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -310,6 +310,15 @@ struct acpi_eject_event {
         u32             event;
 };
 
+struct acpi_hp_work {
+        struct work_struct work;
+        acpi_handle handle;
+        u32 type;
+        void *context;
+};
+void alloc_acpi_hp_work(acpi_handle handle, u32 type, void *context,
+                        void (*func)(struct work_struct *work));
+
 extern struct kobject *acpi_kobj;
 extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
 void acpi_bus_private_data_handler(acpi_handle, void *);
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 43152742b46f..66f1fd70e8c2 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -193,8 +193,6 @@ void acpi_os_fixed_event_count(u32 fixed_event_number);
 /*
  * Threads and Scheduling
  */
-extern struct workqueue_struct *kacpi_hotplug_wq;
-
 acpi_thread_id acpi_os_get_thread_id(void);
 
 acpi_status
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 6860f4dec997..056d3d66b976 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -286,6 +286,7 @@ struct pci_dev {
         unsigned int    irq;
         struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
 
+        bool match_driver;              /* Skip attaching driver */
         /* These fields are used by common fixups */
         unsigned int    transparent:1;  /* Transparent PCI bridge */
         unsigned int    multifunction:1;/* Part of multi-function device */