From 5205a16d8870cdd4cc524589de3e09ad176d129a Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 21 Jun 2000 01:44:39 +0000 Subject: Merge with Linux 2.4.0-ac22-riel. --- drivers/video/imsttfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/video/imsttfb.c') diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c index ed3413c9f..2fbca3ef4 100644 --- a/drivers/video/imsttfb.c +++ b/drivers/video/imsttfb.c @@ -1599,7 +1599,7 @@ static struct fb_ops imsttfb_ops = { fb_get_var: imsttfb_get_var, fb_set_var: imsttfb_set_var, fb_get_cmap: imsttfb_get_cmap, - fb_set_cmap imsttfb_set_cmap, + fb_set_cmap: imsttfb_set_cmap, fb_pan_display: imsttfb_pan_display, fb_ioctl: imsttfb_ioctl, }; -- cgit v1.2.3