From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 20 Apr 2011 09:20:26 +0000 (+0900)
Subject: s3fb: fix up DDC build with MTRR disabled.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4f2970b9f622ba180680a5892be6534cc58843e0;p=deliverable%2Flinux.git

s3fb: fix up DDC build with MTRR disabled.

drivers/video/s3fb.c: In function 's3_pci_remove':
drivers/video/s3fb.c:1388: error: 'par' undeclared (first use in this function)

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 9a345209535b..4ca5d0c8fe84 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -1369,12 +1369,11 @@ err_enable_device:
 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;