diff -ur 5.01.01.04/ql4_dbg.c 5.01.01.04-hardy/ql4_dbg.c
--- 5.01.01.04/ql4_dbg.c	2007-12-18 16:59:57.000000000 -0500
+++ 5.01.01.04-hardy/ql4_dbg.c	2008-07-23 18:53:30.000000000 -0400
@@ -261,7 +261,7 @@
 		printk("  tag = %d, transfersize = 0x%x \n",
 		       cmd->tag, cmd->transfersize);
 
-		printk("  Pid = %d, SP = 0x%p\n", (int)cmd->pid, CMD_SP(cmd));
+		printk("  Pid = %d, SP = 0x%p\n", (int)cmd->serial_number, CMD_SP(cmd));
 		printk("  underflow size = 0x%x, direction=0x%x\n",
 		       cmd->underflow, cmd->sc_data_direction);
 
diff -ur 5.01.01.04/ql4_glbl.h 5.01.01.04-hardy/ql4_glbl.h
--- 5.01.01.04/ql4_glbl.h	2007-12-18 16:59:57.000000000 -0500
+++ 5.01.01.04-hardy/ql4_glbl.h	2008-07-23 18:53:30.000000000 -0400
@@ -66,7 +66,7 @@
  * Defined in  ql4_isr.c
  */
 
-extern irqreturn_t qla4xxx_intr_handler(int, void *, struct pt_regs *);
+extern irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id);
 extern void qla4xxx_interrupt_service_routine(scsi_qla_host_t *ha, uint32_t  intr_status);
 extern void __qla4xxx_suspend_lun(scsi_qla_host_t *ha, srb_t *srb, os_lun_t *lun_entry, uint16_t time,
 		    uint16_t retries, int delay);
diff -ur 5.01.01.04/ql4_isr.c 5.01.01.04-hardy/ql4_isr.c
--- 5.01.01.04/ql4_isr.c	2007-12-18 16:59:57.000000000 -0500
+++ 5.01.01.04-hardy/ql4_isr.c	2008-07-23 18:53:30.000000000 -0400
@@ -1317,8 +1317,7 @@
  * Context:
  *	Interrupt context.
  **************************************************************************/
-irqreturn_t
-qla4xxx_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t qla4xxx_intr_handler(int irq, void *dev_id)
 {
 	scsi_qla_host_t *ha;
 	uint32_t intr_status;
diff -ur 5.01.01.04/ql4_os.c 5.01.01.04-hardy/ql4_os.c
--- 5.01.01.04/ql4_os.c	2007-12-18 16:59:57.000000000 -0500
+++ 5.01.01.04-hardy/ql4_os.c	2008-07-23 18:54:29.000000000 -0400
@@ -313,7 +313,7 @@
 	       "Adapter Resets will be issued every 3 minutes!\n");
 #endif
 
-	status = pci_module_init(&qla4xxx_pci_driver);
+	status = pci_register_driver(&qla4xxx_pci_driver);
 
 #ifdef CONFIG_SCSI_QLA4XXX_FAILOVER
 	qla4xxx_ioctl_init();
@@ -521,7 +521,7 @@
 
 	/* Install the interrupt handler with the new ha */
         ret = request_irq(ha->pdev->irq, qla4xxx_intr_handler,
-	    SA_INTERRUPT|SA_SHIRQ, "qla4xxx", ha);
+	    IRQF_DISABLED | IRQF_SHARED, "qla4xxx", ha);
 	if (ret) {
 		ql4_printk(KERN_WARNING, ha,
 		    "Failed to reserve interrupt %d already in use.\n",
@@ -3711,7 +3711,7 @@
 static int
 qla4xxx_do_dpc(void *data)
 {
-	DECLARE_MUTEX_LOCKED(sem);
+	DECLARE_MUTEX(sem);
 	scsi_qla_host_t *ha = (scsi_qla_host_t *) data;
 	ddb_entry_t *ddb_entry, *dtemp;
 	fc_port_t       *fcport;