Skip to content

Commit

Permalink
s3fb: fix up DDC build with MTRR disabled.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Apr 20, 2011
1 parent 86c0f04 commit 4f2970b
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/video/s3fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4f2970b

Please sign in to comment.