diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 22:58:42 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 22:58:42 +0000 |
| commit | eed6b7c84cc33f229f6fecd884d9a22af5bec514 (patch) | |
| tree | 422a7a49328c59053f4fb11805adb753523c2f2c /drivers/video/dn_cfb8.c | |
| parent | a3b90e3c6976551acbac09f5aacd736a1658aaa8 (diff) | |
Merge with Linux 2.4.0-test5-pre6.
Diffstat (limited to 'drivers/video/dn_cfb8.c')
| -rw-r--r-- | drivers/video/dn_cfb8.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/video/dn_cfb8.c b/drivers/video/dn_cfb8.c index 5452f1534..fa2cb1e67 100644 --- a/drivers/video/dn_cfb8.c +++ b/drivers/video/dn_cfb8.c @@ -122,10 +122,6 @@ static int dn_fb_get_cmap(struct fb_cmap *cmap,int kspc,int con, struct fb_info *info); static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con, struct fb_info *info); -static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con, - struct fb_info *info); -static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg, int con, struct fb_info *info); static int dnfbcon_switch(int con,struct fb_info *info); static int dnfbcon_updatevar(int con,struct fb_info *info); @@ -142,8 +138,6 @@ static struct fb_ops dn_fb_ops = { 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; @@ -267,24 +261,6 @@ static int dn_fb_set_cmap(struct fb_cmap *cmap,int kspc,int con, } -static int dn_fb_pan_display(struct fb_var_screeninfo *var, int con, - struct fb_info *info) { - - printk("panning not supported\n"); - - return -EINVAL; - -} - -static int dn_fb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg, int con, struct fb_info *info) { - - printk("no IOCTLs as of yet.\n"); - - return -EINVAL; - -} - static void dn_fb_set_disp(int con, struct fb_info *info) { struct fb_fix_screeninfo fix; |