diff -aurN a/drivers/scsi/Makefile b/drivers/scsi/Makefile
--- a/drivers/scsi/Makefile	2005-06-17 15:48:29.000000000 -0400
+++ b/drivers/scsi/Makefile	2005-06-18 15:19:15.000000000 -0400
@@ -79,7 +79,6 @@
 obj-$(CONFIG_SCSI_QLOGIC_ISP)	+= qlogicisp.o 
 obj-$(CONFIG_SCSI_QLOGIC_FC)	+= qlogicfc.o 
 obj-$(CONFIG_SCSI_QLOGIC_1280)	+= qla1280.o 
-obj-$(CONFIG_SCSI_QLA2XXX)	+= qla2xxx/
 obj-$(CONFIG_SCSI_LPFC)		+= lpfc/
 obj-$(CONFIG_SCSI_PAS16)	+= pas16.o
 obj-$(CONFIG_SCSI_SEAGATE)	+= seagate.o
--- a/drivers/scsi/qla2xxx/Kconfig	2005-10-18 20:05:54.000000000 +0900
+++ b/drivers/scsi/qla2xxx/Kconfig	2005-10-18 20:06:07.000000000 +0900
@@ -1,5 +1,5 @@
 config SCSI_QLA2XXX
 	tristate
-	default (SCSI && PCI)
+	default (n)
 	depends on SCSI && PCI