[Linux-fbdev-devel] [uPATCH] matroxfb undefined parameter

[Peter S. <pe...@p1...>]

With CONFIG_MTRR=n, the matroxfb_base module refuses to load properly,
because a MODULE_PARM doesn't have a corresponding global variable.
Trivial patch appended, please apply.

Peter

--- 2.6.4/drivers/video/matrox/matroxfb_base.c~	2004-02-04 03:44:04.000000000 +0000
+++ 2.6.4/drivers/video/matrox/matroxfb_base.c	2004-03-18 00:23:20.000000000 +0000
@@ -2409,8 +2409,10 @@
 MODULE_PARM_DESC(noinit, "Disables W/SG/SD-RAM and bus interface initialization (0 or 1=do not initialize) (default=0)");
 MODULE_PARM(memtype, "i");
 MODULE_PARM_DESC(memtype, "Memory type for G200/G400 (see Documentation/fb/matroxfb.txt for explanation) (default=3 for G200, 0 for G400)");
+#ifdef CONFIG_MTRR
 MODULE_PARM(mtrr, "i");
 MODULE_PARM_DESC(mtrr, "This speeds up video memory accesses (0=disabled or 1) (default=1)");
+#endif
 MODULE_PARM(sgram, "i");
 MODULE_PARM_DESC(sgram, "Indicates that G100/G200/G400 has SGRAM memory (0=SDRAM, 1=SGRAM) (default=0)");
 MODULE_PARM(inv24, "i");