[TRIVIAL] fix compilation warnings in2.6.2-rc3/drivers/video/neofb.c

From: Junio C Hamano
Date: Sun Feb 01 2004 - 06:22:59 EST


Compiling neofb.c without MTRR results in two "unused variable"
warnings.

--- 2.6.2-rc3/drivers/video/neofb.c 2003-11-26 12:44:30 -0800
+++ 2.6.2-rc3/drivers/video/neofb.c 2004-02-01 03:05:10 -0800
@@ -1649,8 +1649,6 @@
static int __devinit neo_map_video(struct fb_info *info,
struct pci_dev *dev, int video_len)
{
- struct neofb_par *par = (struct neofb_par *) info->par;
-
DBG("neo_map_video");

info->fix.smem_start = pci_resource_start(dev, 0);
@@ -1674,7 +1672,7 @@
info->screen_base);

#ifdef CONFIG_MTRR
- par->mtrr =
+ ((struct neofb_par *)(info->par))->mtrr =
mtrr_add(info->fix.smem_start, pci_resource_len(dev, 0),
MTRR_TYPE_WRCOMB, 1);
#endif
@@ -1686,12 +1684,12 @@

static void __devinit neo_unmap_video(struct fb_info *info)
{
- struct neofb_par *par = (struct neofb_par *) info->par;

DBG("neo_unmap_video");

if (info->screen_base) {
#ifdef CONFIG_MTRR
+ struct neofb_par *par = (struct neofb_par *) info->par;
mtrr_del(par->mtrr, info->fix.smem_start,
info->fix.smem_len);
#endif

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/