diff --git a/[refs] b/[refs]
index f4aa56a9a1d5..f89534e6c7fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7069f09884ac3924dacaabbc769cc0b4ee6ad40
+refs/heads/master: d438bd3aef8ec96af02f5cba0c43aaffd35c0b46
diff --git a/trunk/drivers/scsi/lpfc/Makefile b/trunk/drivers/scsi/lpfc/Makefile
index 88928f00aa2d..5677181c2c93 100644
--- a/trunk/drivers/scsi/lpfc/Makefile
+++ b/trunk/drivers/scsi/lpfc/Makefile
@@ -22,6 +22,8 @@
 ccflags-$(GCOV) := -fprofile-arcs -ftest-coverage
 ccflags-$(GCOV) += -O0
 
+ccflags-y += -Werror
+
 obj-$(CONFIG_SCSI_LPFC) := lpfc.o
 
 lpfc-objs := lpfc_mem.o lpfc_sli.o lpfc_ct.o lpfc_els.o lpfc_hbadisc.o	\