[Compile Regression in 2.4.25-pre8][PATCH 6/42]

[Kronos]

aty128fb.c:1066: warning: `aty128_set_crt_enable' defined but not used
aty128fb.c:1076: warning: `aty128_set_lcd_enable' defined but not used
aty128fb.c:2485: warning: unused variable `fb'
aty128fb.c:2486: warning: unused variable `value'
aty128fb.c:2487: warning: unused variable `rc'

aty128_set_crt_enable and  aty128_set_lcd_enable and  the vars  are used
only when CONFIG_PMAC_PBOOK is defined.

font and mode are used only when the driver is modular.

nomttr is used only when CONFIG_MTRR is defined.

diff -Nru -X dontdiff linux-2.4-vanilla/drivers/video/aty128fb.c linux-2.4/drivers/video/aty128fb.c
--- linux-2.4-vanilla/drivers/video/aty128fb.c	Tue Nov 11 17:51:39 2003
+++ linux-2.4/drivers/video/aty128fb.c	Sat Jan 31 16:45:23 2004
@@ -227,9 +227,10 @@
 static char fontname[40] __initdata = { 0 };
 
 static int  noaccel __initdata = 0;
+#ifdef MODULE
 static char *font __initdata = NULL;
 static char *mode __initdata = NULL;
-static int  nomtrr __initdata = 0;
+#endif
 
 static char *mode_option __initdata = NULL;
 
@@ -244,6 +245,7 @@
 #endif
 
 #ifdef CONFIG_MTRR
+static int nomtrr __initdata = 0;
 static int mtrr = 1;
 #endif
 
@@ -1061,6 +1063,7 @@
     return 0;
 }
 
+#ifdef CONFIG_PMAC_PBOOK
 static void
 aty128_set_crt_enable(struct fb_info_aty128 *info, int on)
 {
@@ -1096,6 +1099,7 @@
 	aty_st_le32(LVDS_GEN_CNTL, reg);
     }
 }
+#endif /* CONFIG_PMAC_PBOOK */
 
 static void
 aty128_set_pll(struct aty128_pll *pll, const struct fb_info_aty128 *info)
@@ -2482,12 +2486,12 @@
 static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
 		       u_long arg, int con, struct fb_info *info)
 {
+#ifdef CONFIG_PMAC_PBOOK
     struct fb_info_aty128 *fb = (struct fb_info_aty128 *)info;
     u32 value;
     int rc;
     
     switch (cmd) {
-#ifdef CONFIG_PMAC_PBOOK
     case FBIO_ATY128_SET_MIRROR:
     	if (fb->chip_gen != rage_M3)
     		return -EINVAL;
@@ -2506,11 +2510,13 @@
     		return -EINVAL;
 	value = (fb->crt_on << 1) | fb->lcd_on;
     	return put_user(value, (__u32*)arg);
-#endif
     default:
 	return -EINVAL;
     }
     return 0;
+#else
+    return -EINVAL;
+#endif
 }
 
 #ifdef CONFIG_PMAC_BACKLIGHT

-- 
Reply-To: kronos@xxxxxxxxxxxxxx
Home: http://kronoz.cjb.net
Dicono che  il cane sia  il miglior  amico dell'uomo. Secondo me  non e`
vero. Quanti dei vostri amici avete fatto castrare, recentemente?
-
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/