Commit 76598ebe authored Dec 29, 2006 by Judith Lebzelter Committed by Linus Torvalds Dec 30, 2006

[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>

parent 1ebb1101

drivers/scsi/ibmvscsi/Makefile

+2 −0

Original line number	Diff line number	Diff line
		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