diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /drivers/video/fm2fb.c | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'drivers/video/fm2fb.c')
| -rw-r--r-- | drivers/video/fm2fb.c | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c index 9a7690d34..6dfd369d1 100644 --- a/drivers/video/fm2fb.c +++ b/drivers/video/fm2fb.c @@ -183,8 +183,6 @@ static struct fb_var_screeninfo fb_var_modes[] __initdata = { * Interface used by the world */ -static int fm2fb_open(struct fb_info *info, int user); -static int fm2fb_release(struct fb_info *info, int user); static int fm2fb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info); static int fm2fb_get_var(struct fb_var_screeninfo *var, int con, @@ -223,32 +221,16 @@ static void do_install_cmap(int con, struct fb_info *info); static struct fb_ops fm2fb_ops = { - fm2fb_open, fm2fb_release, fm2fb_get_fix, fm2fb_get_var, fm2fb_set_var, - fm2fb_get_cmap, fm2fb_set_cmap, fm2fb_pan_display, fm2fb_ioctl + owner: THIS_MODULE, + fb_get_fix: fm2fb_get_fix, + fb_get_var: fm2fb_get_var, + fb_set_var: fm2fb_set_var, + fb_get_cmap: fm2fb_get_cmap, + fb_set_cmap fm2fb_set_cmap, + fb_pan_display: fm2fb_pan_display, + fb_ioctl: fm2fb_ioctl, }; - - /* - * Open/Release the frame buffer device - */ - -static int fm2fb_open(struct fb_info *info, int user) -{ - /* - * Nothing, only a usage count for the moment - */ - - MOD_INC_USE_COUNT; - return(0); -} - -static int fm2fb_release(struct fb_info *info, int user) -{ - MOD_DEC_USE_COUNT; - return(0); -} - - /* * Get the Fixed Part of the Display */ |