From bc21fd6a2f3bfd133c52546a77a8d031e9c8ff91 Mon Sep 17 00:00:00 2001
From: Judith Lebzelter <judith@osdl.org>
Date: Fri, 29 Dec 2006 16:47:06 -0800
Subject: [PATCH] --- yaml --- r: 45100 b: refs/heads/master c:
 76598ebe081b04132f272440183e0aeb6507a079 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/ibmvscsi/Makefile | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9f9d62802c78..d6049b2f2c1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ebb1101c556b1915ff041655e629a072e64dcda
+refs/heads/master: 76598ebe081b04132f272440183e0aeb6507a079
diff --git a/trunk/drivers/scsi/ibmvscsi/Makefile b/trunk/drivers/scsi/ibmvscsi/Makefile
index 6ac0633d5452..f67d9efc7a99 100644
--- a/trunk/drivers/scsi/ibmvscsi/Makefile
+++ b/trunk/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