diff options
| author | Dave Jones <davej@redhat.com> | 2005-01-12 04:04:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-12 04:04:43 -0800 |
| commit | cb113d2e925ad7973c80d449a201e2a1adff90f4 (patch) | |
| tree | f82f79c33faeec5b0597d98314c50191a5bdffb3 /drivers | |
| parent | c5a379cdb48cf7f77195e2f714c3239fc895c12c (diff) | |
| download | history-cb113d2e925ad7973c80d449a201e2a1adff90f4.tar.gz | |
[PATCH] matroxfb driver broken on non-x86.
This broke since the recent MODULE_PARAM conversion on
architectures that don't have CONFIG_MTRR
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 0fdf9af099d33d..470428e9124532 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c @@ -2477,8 +2477,10 @@ module_param(noinit, int, 0); MODULE_PARM_DESC(noinit, "Disables W/SG/SD-RAM and bus interface initialization (0 or 1=do not initialize) (default=0)"); module_param(memtype, int, 0); 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_param(mtrr, int, 0); MODULE_PARM_DESC(mtrr, "This speeds up video memory accesses (0=disabled or 1) (default=1)"); +#endif module_param(sgram, int, 0); MODULE_PARM_DESC(sgram, "Indicates that G100/G200/G400 has SGRAM memory (0=SDRAM, 1=SGRAM) (default=0)"); module_param(inv24, int, 0); |