diff options
| author | Judith Lebzelter <judith@osdl.org> | 2006-12-29 19:47:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 13:55:54 -0500 |
| commit | 76598ebe081b04132f272440183e0aeb6507a079 (patch) | |
| tree | 11ab1593eec584516546ece4e5446541dd74fc89 | |
| parent | 1ebb1101c556b1915ff041655e629a072e64dcda (diff) | |
[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>
| -rw-r--r-- | drivers/scsi/ibmvscsi/Makefile | 2 |
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 @@ | |||
| 1 | obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsic.o | 1 | obj-$(CONFIG_SCSI_IBMVSCSI) += ibmvscsic.o |
| 2 | 2 | ||
| 3 | ibmvscsic-y += ibmvscsi.o | 3 | ibmvscsic-y += ibmvscsi.o |
| 4 | ifndef CONFIG_PPC_PSERIES | ||
| 4 | ibmvscsic-$(CONFIG_PPC_ISERIES) += iseries_vscsi.o | 5 | ibmvscsic-$(CONFIG_PPC_ISERIES) += iseries_vscsi.o |
| 6 | endif | ||
| 5 | ibmvscsic-$(CONFIG_PPC_PSERIES) += rpa_vscsi.o | 7 | ibmvscsic-$(CONFIG_PPC_PSERIES) += rpa_vscsi.o |
| 6 | 8 | ||
| 7 | obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvstgt.o | 9 | obj-$(CONFIG_SCSI_IBMVSCSIS) += ibmvstgt.o |