]>
Commit | Line | Data |
---|---|---|
2e5e4ff3 | 1 | --- 2.6.2-rc3/drivers/video/neofb.c 2003-11-26 12:44:30 -0800 |
2 | +++ 2.6.2-rc3/drivers/video/neofb.c 2004-02-01 03:05:10 -0800 | |
3 | @@ -1649,8 +1649,6 @@ | |
4 | static int __devinit neo_map_video(struct fb_info *info, | |
5 | struct pci_dev *dev, int video_len) | |
6 | { | |
7 | - struct neofb_par *par = (struct neofb_par *) info->par; | |
8 | - | |
9 | DBG("neo_map_video"); | |
10 | ||
11 | info->fix.smem_start = pci_resource_start(dev, 0); | |
12 | @@ -1674,7 +1672,7 @@ | |
13 | info->screen_base); | |
14 | ||
15 | #ifdef CONFIG_MTRR | |
16 | - par->mtrr = | |
17 | + ((struct neofb_par *)(info->par))->mtrr = | |
18 | mtrr_add(info->fix.smem_start, pci_resource_len(dev, 0), | |
19 | MTRR_TYPE_WRCOMB, 1); | |
20 | #endif | |
21 | @@ -1686,12 +1684,12 @@ | |
22 | ||
23 | static void __devinit neo_unmap_video(struct fb_info *info) | |
24 | { | |
25 | - struct neofb_par *par = (struct neofb_par *) info->par; | |
26 | ||
27 | DBG("neo_unmap_video"); | |
28 | ||
29 | if (info->screen_base) { | |
30 | #ifdef CONFIG_MTRR | |
31 | + struct neofb_par *par = (struct neofb_par *) info->par; | |
32 | mtrr_del(par->mtrr, info->fix.smem_start, | |
33 | info->fix.smem_len); | |
34 | #endif |