From: Judith Lebzelter <judith@osdl.org>

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@osdl.org>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 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,5 +1,7 @@
 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 
_