Skip to contentSkip to conversation

Revert accidental Makefile change

PATCH In review Pavel Roskin 2 participants 2 messages Jul 27, 2005

Subsystems (2)
SCSI QLogic QLA2XXX FC-SCSI driver
lore
Share & tools
lore

Pavel Roskin

author
#0 lore raw

PATCH 1/1 Revert accidental Makefile change

Hello!

In the current git kernel, the qla2xxx.ko module is build and installed, although I have never requested it and I don't have any modules enabled.

I found the corresponding entry in the git log (commit fca297037127e524e8f61b3fc1c7a1886e5d757b), and it looks like that the change in drivers/scsi/qla2xxx/Makefile was committed accidentally. The comment doesn't refer to Makefile.

Signed-off-by Pavel Roskin <[email protected]>
drivers/scsi/qla2xxx/Makefile +0 -3
@@ -1,6 +1,4 @@
 EXTRA_CFLAGS += -DUNIQUE_FW_NAME
-CONFIG_SCSI_QLA24XX=m
-EXTRA_CFLAGS += -DCONFIG_SCSI_QLA24XX -DCONFIG_SCSI_QLA24XX_MODULE
 
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o

@@ -16,4 +14,3 @@ obj-$(CONFIG_SCSI_QLA22XX) += qla2xxx.o 
 obj-$(CONFIG_SCSI_QLA2300) += qla2xxx.o qla2300.o
 obj-$(CONFIG_SCSI_QLA2322) += qla2xxx.o qla2322.o
 obj-$(CONFIG_SCSI_QLA6312) += qla2xxx.o qla6312.o
-obj-$(CONFIG_SCSI_QLA24XX) += qla2xxx.o
Signature · 2 lines
Regards,
Pavel Roskin
#1 lore raw
Quoted 21 lines · Pavel Roskin

In the current git kernel, the qla2xxx.ko module is build and installed, although I have never requested it and I don't have any modules enabled.

I found the corresponding entry in the git log (commit fca297037127e524e8f61b3fc1c7a1886e5d757b), and it looks like that the change in drivers/scsi/qla2xxx/Makefile was committed accidentally. The comment doesn't refer to Makefile.

Signed-off-by Pavel Roskin <[email protected]>
drivers/scsi/qla2xxx/Makefile +0 -2
@@ -1,6 +1,4 @@
 EXTRA_CFLAGS += -DUNIQUE_FW_NAME
-CONFIG_SCSI_QLA24XX=m
-EXTRA_CFLAGS += -DCONFIG_SCSI_QLA24XX -DCONFIG_SCSI_QLA24XX_MODULE
 
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o

drivers/scsi/qla2xxx/Makefile obj-$(CONFIG_SCSI_QLA22XX) += qla2xxx.o · line 19

Quoted 4 lines
drivers/scsi/qla2xxx/Makefile +0 -1
@@ -16,4 +14,3 @@ obj-$(CONFIG_SCSI_QLA22XX) += qla2xxx.o 
 obj-$(CONFIG_SCSI_QLA2300) += qla2xxx.o qla2300.o
 obj-$(CONFIG_SCSI_QLA2322) += qla2xxx.o qla2322.o
 obj-$(CONFIG_SCSI_QLA6312) += qla2xxx.o qla6312.o
-obj-$(CONFIG_SCSI_QLA24XX) += qla2xxx.o

I had already submitted a patch which took care of this:

http://marc.theaimsgroup.com/?l=linux-scsi&m=112143863232467&w=2

There also appears to be some other (separate) Kbuild issues which I'm hashing through...

Regards,
Andrew Vasquez