The patch titled
scsi: make pcmcia directory use obj-y|m instead of subdir-y|m
has been removed from the -mm tree. Its filename was
scsi-make-pcmcia-directory-use-obj-ym-instead-of-subdir-ym.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: scsi: make pcmcia directory use obj-y|m instead of subdir-y|m
From: Tejun Heo <htejun@xxxxxxxxx>
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 <htejun@xxxxxxxxx>
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/scsi/Makefile~scsi-make-pcmcia-directory-use-obj-ym-instead-of-subdir-ym drivers/scsi/Makefile
--- a/drivers/scsi/Makefile~scsi-make-pcmcia-directory-use-obj-ym-instead-of-subdir-ym
+++ a/drivers/scsi/Makefile
@@ -17,7 +17,7 @@
CFLAGS_aha152x.o = -DAHA152X_STAT -DAUTOCONF
CFLAGS_gdth.o = # -DDEBUG_GDTH=2 -D__SERIAL__ -D__COM2__ -DGDTH_STATISTICS
-subdir-$(CONFIG_PCMCIA) += pcmcia
+obj-$(CONFIG_PCMCIA) += pcmcia/
obj-$(CONFIG_SCSI) += scsi_mod.o
obj-$(CONFIG_SCSI_TGT) += scsi_tgt.o
_
Patches currently in -mm which might be from htejun@xxxxxxxxx are
origin.patch
git-kbuild.patch
git-libata-all.patch
libata-xfer_mask-is-unsigned-int-not-unsigned-long.patch
libata-add-toshiba-mk1637gsx-to-spurious-command-completion-list.patch
libata-set-proper-ata-udma-mode-for-bf548-according-to-system-clock-checkpatch-fixes.patch
libata-fix-early-use-of-port-printk-checkpatch-fixes.patch
git-scsi-misc.patch
git-block.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
