Skip to content

Commit

Permalink
[PATCH] powerpc iseries link error in allmodconfig
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Judith Lebzelter authored and Linus Torvalds committed Dec 30, 2006
1 parent 1ebb110 commit 76598eb
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/scsi/ibmvscsi/Makefile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 76598eb

Please sign in to comment.