From 4f2970b9f622ba180680a5892be6534cc58843e0 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 20 Apr 2011 18:20:26 +0900 Subject: [PATCH] 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 Signed-off-by: Paul Mundt --- drivers/video/s3fb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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; -- 2.20.1