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/vfb.c | |
parent | e8b2e78e4f14d329f2cdfb8ef7ed3582c71454e5 (diff) |
Merge with Linux 2.4.0-ac22-riel.
Diffstat (limited to 'drivers/video/vfb.c')
-rw-r--r-- | drivers/video/vfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c index 53c30e92f..0d00b6f4a 100644 --- a/drivers/video/vfb.c +++ b/drivers/video/vfb.c @@ -127,7 +127,7 @@ static struct fb_ops vfb_ops = { fb_get_var: vfb_get_var, fb_set_var: vfb_set_var, fb_get_cmap: vfb_get_cmap, - fb_set_cmap vfb_set_cmap, + fb_set_cmap: vfb_set_cmap, fb_pan_display: vfb_pan_display, fb_ioctl: vfb_ioctl, }; |