diff -ur 5.00.07-orig/ql4_32ioctl.c 5.00.07/ql4_32ioctl.c
--- 5.00.07-orig/ql4_32ioctl.c	2006-07-20 21:31:21.000000000 +0000
+++ 5.00.07/ql4_32ioctl.c	2008-03-11 22:10:03.088021525 +0000
@@ -5,7 +5,6 @@
  * See LICENSE.qla4xxx for copyright and licensing details.
  */
 
-#include <linux/config.h>
 #include "ql4_def.h"
 
 #if defined QLA_CONFIG_COMPAT
diff -ur 5.00.07-orig/ql4_os.c 5.00.07/ql4_os.c
--- 5.00.07-orig/ql4_os.c	2006-07-20 21:31:21.000000000 +0000
+++ 5.00.07/ql4_os.c	2008-03-11 22:09:14.585257489 +0000
@@ -304,7 +304,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();
@@ -2777,7 +2777,7 @@
 		DEBUG2(printk(
 		    "scsi%d: PORT DEAD cmd=%p cdb[0]=%02X, cmd_err_flag=0x%x "
 		    "errid=%d, fcport=%p, did_error=%x\n",
-    		ha->host_no, srb->cmd, srb->cmd->data_cmnd[0], srb->cmd->eh_eflags,
+    		ha->host_no, srb->cmd, srb->cmd->cmnd[0], srb->cmd->eh_eflags,
 		srb->err_id, fcport, host_byte(cmd->result)));
 #ifndef CONFIG_SCSI_QLA4XXX_USE_KERNELQ
 		add_to_done_srb_q(ha, srb);
diff -ur 5.00.07-orig/ql4_xioct.c 5.00.07/ql4_xioct.c
--- 5.00.07-orig/ql4_xioct.c	2006-07-20 21:31:21.000000000 +0000
+++ 5.00.07/ql4_xioct.c	2008-03-11 22:11:05.591583353 +0000
@@ -3838,7 +3838,7 @@
 	}
 
 	memcpy(pscsi_cmd->cmnd, pscsi_pass->Cdb, pscsi_cmd->cmd_len);
-	memcpy(pscsi_cmd->data_cmnd, pscsi_pass->Cdb, pscsi_cmd->cmd_len);
+	memcpy(pscsi_cmd->cmnd, pscsi_pass->Cdb, pscsi_cmd->cmd_len);
 
 	QL4PRINT(QLP4,
 	    printk("scsi%d:%d:%d:%d: %s: CDB = ",