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/hpfb.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/hpfb.c')
| -rw-r--r-- | drivers/video/hpfb.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c index 5314ece8b..2b65ba876 100644 --- a/drivers/video/hpfb.c +++ b/drivers/video/hpfb.c @@ -246,15 +246,6 @@ static void hpfb_blank(int blank, struct fb_info *info) /* Not supported */ } -static int hpfb_open(struct fb_info *info, int user) -{ - /* - * Nothing, only a usage count for the moment - */ - MOD_INC_USE_COUNT; - return(0); -} - static void hpfb_set_disp(int con) { struct fb_fix_screeninfo fix; @@ -281,22 +272,14 @@ static void hpfb_set_disp(int con) display->dispsw = &fbcon_cfb8; } -static int hpfb_release(struct fb_info *info, int user) -{ - MOD_DEC_USE_COUNT; - return(0); -} - static struct fb_ops hpfb_ops = { - hpfb_open, - hpfb_release, - hpfb_get_fix, - hpfb_get_var, - hpfb_set_var, - hpfb_get_cmap, - hpfb_set_cmap, - NULL, - hpfb_ioctl + owner: THIS_MODULE, + fb_get_fix: hpfb_get_fix, + fb_get_var: hpfb_get_var, + fb_set_var: hpfb_set_var, + fb_get_cmap: hpfb_get_cmap, + fb_set_cmap hpfb_set_cmap, + fb_ioctl: hpfb_ioctl, }; #define TOPCAT_FBOMSB 0x5d |