diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
| commit | 5205a16d8870cdd4cc524589de3e09ad176d129a (patch) | |
| tree | 6deddf1269b9e6f13f2fa00529cd4674c3b2a3fa /drivers/video/matrox/matroxfb_crtc2.c | |
| parent | e8b2e78e4f14d329f2cdfb8ef7ed3582c71454e5 (diff) | |
Merge with Linux 2.4.0-ac22-riel.
Diffstat (limited to 'drivers/video/matrox/matroxfb_crtc2.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_crtc2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 2dd01a3b2..1219c0f2f 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c @@ -559,7 +559,7 @@ static struct fb_ops matroxfb_dh_ops = { fb_get_var: matroxfb_dh_get_var, fb_set_var: matroxfb_dh_set_var, fb_get_cmap: matroxfb_dh_get_cmap, - fb_set_cmap matroxfb_dh_set_cmap, + fb_set_cmap: matroxfb_dh_set_cmap, fb_pan_display: matroxfb_dh_pan_display, fb_ioctl: matroxfb_dh_ioctl, }; |