Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268345
b: refs/heads/master
c: 7c1387e
h: refs/heads/master
i:
  268343: abfb130
v: v3
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Sep 12, 2011
1 parent 50db572 commit fd8b3bf
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 15ebe6c657db155fbb04143b1a655b8a58b0402e
refs/heads/master: 7c1387e0ec02f5b44f292b6639a93a2aea949ba0
6 changes: 2 additions & 4 deletions trunk/drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -2414,10 +2414,8 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
fb_alloc_cmap(&fb_info->cmap, 256 , 0);

#ifdef CONFIG_MTRR
xgi_video_info.mtrr = mtrr_add(
(unsigned int) xgi_video_info.video_base,
(unsigned int) xgi_video_info.video_size,
MTRR_TYPE_WRCOMB, 1);
xgi_video_info.mtrr = mtrr_add(xgi_video_info.video_base,
xgi_video_info.video_size, MTRR_TYPE_WRCOMB, 1);
if (xgi_video_info.mtrr >= 0)
dev_info(&pdev->dev, "added MTRR\n");
#endif
Expand Down

0 comments on commit fd8b3bf

Please sign in to comment.