Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 251001
b: refs/heads/master
c: 4f2970b
h: refs/heads/master
i:
  250999: dd0e38f
v: v3
  • Loading branch information
Paul Mundt committed Apr 20, 2011
1 parent 839048a commit f05333c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 86c0f043a737dadf034a4e6f29aefb074f4a1146
refs/heads/master: 4f2970b9f622ba180680a5892be6534cc58843e0
3 changes: 1 addition & 2 deletions trunk/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 f05333c

Please sign in to comment.