SCSI: make pcmcia directory use obj-y|m instead of subdir-y|m
PATCH 1/1 SCSI: make pcmcia directory use obj-y|m instead of subdir-y|m
subdir-y|m isn't supposed to contain modules or built-in components. Change subdir-$(CONFIG_PCMCIA) to obj-$(CONFIG_PCMCIA).
Signed-off-by Tejun Heo <[email protected]>
Cc Sam Ravnborg <[email protected]>
Cc James Bottomley <[email protected]>
--- drivers/scsi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/Makefile +1 -1
@@ -18,7 +18,7 @@ CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS CFLAGS_seagate.o = -DARBITRATE -DPARITY -DSEAGATE_USE_ASM -subdir-$(CONFIG_PCMCIA) += pcmcia +obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_SCSI) += scsi_mod.o obj-$(CONFIG_SCSI_TGT) += scsi_tgt.o
Quoted 6 lines · Tejun Heo
subdir-y|m isn't supposed to contain modules or built-in components. Change subdir-$(CONFIG_PCMCIA) to obj-$(CONFIG_PCMCIA).
Signed-off-by Tejun Heo <[email protected]>Cc Sam Ravnborg <[email protected]>Cc James Bottomley <[email protected]>
Quoted 17 lines
--- drivers/scsi/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/scsi/Makefile +1
-1@@ -18,7 +18,7 @@ CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS CFLAGS_seagate.o = -DARBITRATE -DPARITY -DSEAGATE_USE_ASM -subdir-$(CONFIG_PCMCIA) += pcmcia +obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_SCSI) += scsi_mod.o obj-$(CONFIG_SCSI_TGT) += scsi_tgt.o
Quoted 8 lines · Sam Ravnborg
Quoted 6 lines · Tejun Heo
subdir-y|m isn't supposed to contain modules or built-in components. Change subdir-$(CONFIG_PCMCIA) to obj-$(CONFIG_PCMCIA).
Signed-off-by Tejun Heo <[email protected]>Cc Sam Ravnborg <[email protected]>Cc James Bottomley <[email protected]>
Thanks. I guess this should go through SCSI tree. James, can you please forward this upstream?
Signature · 1 line
tejun