summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJudith Lebzelter <judith@osdl.org>2006-12-30 03:47:06 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-30 21:55:54 +0300
commit76598ebe081b04132f272440183e0aeb6507a079 (patch)
tree11ab1593eec584516546ece4e5446541dd74fc89 /drivers
parent1ebb1101c556b1915ff041655e629a072e64dcda (diff)
downloadlinux-76598ebe081b04132f272440183e0aeb6507a079.tar.xz
[PATCH] powerpc iseries link error in allmodconfig
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> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/ibmvscsi/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/ibmvscsi/Makefile b/drivers/scsi/ibmvscsi/Makefile
index 6ac0633d5452..f67d9efc7a99 100644
--- a/drivers/scsi/ibmvscsi/Makefile
+++ b/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