From 61587977de3c807dad58b7e6cd33af4729e075f9 Mon Sep 17 00:00:00 2001
From: James Bottomley <jbottomley@parallels.com>
Date: Thu, 21 Jun 2012 07:50:02 +0000
Subject: [PATCH] --- yaml --- r: 316817 b: refs/heads/master c:
 4bdd03e61b7a5c4c6bc2b25d46fcd491788fdfb3 h: refs/heads/master i:   316815:
 83b48a3e0a4adc9e412102da515457f728b73001 v: v3

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

diff --git a/[refs] b/[refs]
index afe8fc2b5ddd..32636c1d59c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cca85013ef54f66eb4616e6f3860549a96c8338b
+refs/heads/master: 4bdd03e61b7a5c4c6bc2b25d46fcd491788fdfb3
diff --git a/trunk/drivers/scsi/lpfc/Makefile b/trunk/drivers/scsi/lpfc/Makefile
index fe5d396aca73..e2516ba8ebfa 100644
--- a/trunk/drivers/scsi/lpfc/Makefile
+++ b/trunk/drivers/scsi/lpfc/Makefile
@@ -22,7 +22,9 @@
 ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage
 ccflags-$(GCOV) += -O0
 
+ifdef WARNINGS_BECOME_ERRORS
 ccflags-y += -Werror
+endif
 
 obj-$(CONFIG_SCSI_LPFC) := lpfc.o