diff --git a/[refs] b/[refs]
index ef5e1083cf97..3f52661ca498 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86c0f043a737dadf034a4e6f29aefb074f4a1146
+refs/heads/master: 4f2970b9f622ba180680a5892be6534cc58843e0
diff --git a/trunk/drivers/video/s3fb.c b/trunk/drivers/video/s3fb.c
index 9a345209535b..4ca5d0c8fe84 100644
--- a/trunk/drivers/video/s3fb.c
+++ b/trunk/drivers/video/s3fb.c
@@ -1369,12 +1369,11 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i
 static void __devexit s3_pci_remove(struct pci_dev *dev)
 {
 	struct fb_info *info = pci_get_drvdata(dev);
+	struct s3fb_info __maybe_unused *par = info->par;
 
 	if (info) {
 
 #ifdef CONFIG_MTRR
-		struct s3fb_info *par = info->par;
-
 		if (par->mtrr_reg >= 0) {
 			mtrr_del(par->mtrr_reg, 0, 0);
 			par->mtrr_reg = -1;