3 files changed, 9 insertions, 0 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 5b595fdfb672..6d2345d86082 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -378,6 +378,7 @@ extern void device_bind_driver(struct device * dev);
 extern void device_release_driver(struct device * dev);
 extern int  device_attach(struct device * dev);
 extern void driver_attach(struct device_driver * drv);
+extern void device_reprobe(struct device *dev);
 
 
 /*
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index b9810ddf435a..ec3c32932620 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -852,6 +852,8 @@
 #define PCI_DEVICE_ID_QLOGIC_ISP2432    0x2432
 #define PCI_DEVICE_ID_QLOGIC_ISP2512    0x2512
 #define PCI_DEVICE_ID_QLOGIC_ISP2522    0x2522
+#define PCI_DEVICE_ID_QLOGIC_ISP5422    0x5422
+#define PCI_DEVICE_ID_QLOGIC_ISP5432    0x5432
 
 #define PCI_VENDOR_ID_CYRIX             0x1078
 #define PCI_DEVICE_ID_CYRIX_5510        0x0000
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 86b111300231..957c21c16d62 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -20,6 +20,10 @@ struct work_struct {
         struct timer_list timer;
 };
 
+struct execute_work {
+        struct work_struct work;
+};
+
 #define __WORK_INITIALIZER(n, f, d) {                           \
         .entry  = { &(n).entry, &(n).entry },                   \
         .func = (f),                                            \
@@ -74,6 +78,8 @@ extern void init_workqueues(void);
 void cancel_rearming_delayed_work(struct work_struct *work);
 void cancel_rearming_delayed_workqueue(struct workqueue_struct *,
                                        struct work_struct *);
+int execute_in_process_context(void (*fn)(void *), void *,
+                               struct execute_work *);
 
 /*
  * Kill off a pending schedule_delayed_work().  Note that the work callback