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/vfb.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/vfb.c')
| -rw-r--r-- | drivers/video/vfb.c | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c index 165b03077..53c30e92f 100644 --- a/drivers/video/vfb.c +++ b/drivers/video/vfb.c @@ -80,8 +80,6 @@ static int vfb_enable = 0; /* disabled by default */ int vfb_setup(char*); -static int vfb_open(struct fb_info *info, int user); -static int vfb_release(struct fb_info *info, int user); static int vfb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info); static int vfb_get_var(struct fb_var_screeninfo *var, int con, @@ -124,32 +122,16 @@ static void do_install_cmap(int con, struct fb_info *info); static struct fb_ops vfb_ops = { - vfb_open, vfb_release, vfb_get_fix, vfb_get_var, vfb_set_var, vfb_get_cmap, - vfb_set_cmap, vfb_pan_display, vfb_ioctl + owner: THIS_MODULE, + fb_get_fix: vfb_get_fix, + 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_pan_display: vfb_pan_display, + fb_ioctl: vfb_ioctl, }; - - /* - * Open/Release the frame buffer device - */ - -static int vfb_open(struct fb_info *info, int user) -{ - /* - * Nothing, only a usage count for the moment - */ - - MOD_INC_USE_COUNT; - return(0); -} - -static int vfb_release(struct fb_info *info, int user) -{ - MOD_DEC_USE_COUNT; - return(0); -} - - /* * Get the Fixed Part of the Display */ |