diff --git a/[refs] b/[refs] index 4d829e5de149..74125b93bf23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5350c65f4f15bbc111ffa629130d3f32cdd4ccf6 +refs/heads/master: 94f61a7666224ab307e387ff0d146055ae77e6ab diff --git a/trunk/drivers/video/i740fb.c b/trunk/drivers/video/i740fb.c index 8be030221343..fe574d84ed99 100644 --- a/trunk/drivers/video/i740fb.c +++ b/trunk/drivers/video/i740fb.c @@ -1179,9 +1179,9 @@ static void __devexit i740fb_remove(struct pci_dev *dev) struct fb_info *info = pci_get_drvdata(dev); if (info) { -#ifdef CONFIG_MTRR struct i740fb_par *par = info->par; +#ifdef CONFIG_MTRR if (par->mtrr_reg >= 0) { mtrr_del(par->mtrr_reg, 0, 0); par->mtrr_reg = -1;