The patch titled
powerpc iseries link error in allmodconfig
has been removed from the -mm tree. Its filename was
powerpc-iseries-link-error-in-allmodconfig.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: powerpc iseries link error in allmodconfig
From: Judith Lebzelter <judith@xxxxxxxx>
Choose rpa_vscsi.c over iseries_vscsi.c when building both pseries and
iseries. This fixes a link error.
Signed-off-by: Judith Lebzelter <judith@xxxxxxxx>
Acked-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/ibmvscsi/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff -puN drivers/scsi/ibmvscsi/Makefile~powerpc-iseries-link-error-in-allmodconfig drivers/scsi/ibmvscsi/Makefile
--- a/drivers/scsi/ibmvscsi/Makefile~powerpc-iseries-link-error-in-allmodconfig
+++ a/drivers/scsi/ibmvscsi/Makefile
@@ -1,7 +1,9 @@
obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsic.o
ibmvscsic-y += ibmvscsi.o
+ifndef CONFIG_PPC_PSERIES
ibmvscsic-$(CONFIG_PPC_ISERIES) += iseries_vscsi.o
+endif
ibmvscsic-$(CONFIG_PPC_PSERIES) += rpa_vscsi.o
obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvstgt.o
_
Patches currently in -mm which might be from judith@xxxxxxxx are
-
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
