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/dn_cfb8.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/dn_cfb8.c')
| -rw-r--r-- | drivers/video/dn_cfb8.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/drivers/video/dn_cfb8.c b/drivers/video/dn_cfb8.c index fe650f6e3..99dc0c299 100644 --- a/drivers/video/dn_cfb8.c +++ b/drivers/video/dn_cfb8.c @@ -112,8 +112,6 @@ void dn_video_setup(char *options, int *ints); /* frame buffer operations */ -static int dn_fb_open(struct fb_info *info); -static int dn_fb_release(struct fb_info *info); static int dn_fb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info); static int dn_fb_get_var(struct fb_var_screeninfo *var, int con, @@ -137,9 +135,15 @@ static void dn_fb_set_disp(int con,struct fb_info *info); static struct display disp[MAX_NR_CONSOLES]; static struct fb_info fb_info; -static struct fb_ops dn_fb_ops = { - dn_fb_open,dn_fb_release, dn_fb_get_fix, dn_fb_get_var, dn_fb_set_var, - dn_fb_get_cmap, dn_fb_set_cmap, dn_fb_pan_display, dn_fb_ioctl +static struct fb_ops dn_fb_ops = { + owner: THIS_MODULE, + fb_get_fix: dn_fb_get_fix, + fb_get_var: dn_fb_get_var, + fb_set_var: dn_fb_set_var, + fb_get_cmap: dn_fb_get_cmap, + fb_set_cmap dn_fb_set_cmap, + fb_pan_display: dn_fb_pan_display, + fb_ioctl: dn_fb_ioctl, }; static int currcon=0; @@ -158,22 +162,6 @@ static char dn_fb_name[]="Apollo "; static struct display_switch dispsw_apollofb; -static int dn_fb_open(struct fb_info *info) -{ - /* - * Nothing, only a usage count for the moment - */ - - MOD_INC_USE_COUNT; - return(0); -} - -static int dn_fb_release(struct fb_info *info) -{ - MOD_DEC_USE_COUNT; - return(0); -} - static int dn_fb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info) { |