diff options
Diffstat (limited to 'drivers/video/sis/sis_main.h')
-rw-r--r-- | drivers/video/sis/sis_main.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h index 445bcbba03ae..70b6df371b8e 100644 --- a/drivers/video/sis/sis_main.h +++ b/drivers/video/sis/sis_main.h | |||
@@ -727,9 +727,14 @@ static int sisfb_ioctl(struct inode *inode, struct file *file, | |||
727 | #endif | 727 | #endif |
728 | 728 | ||
729 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) | 729 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) |
730 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) | ||
731 | static int sisfb_ioctl(struct fb_info *info, unsigned int cmd, | ||
732 | unsigned long arg); | ||
733 | #else | ||
730 | static int sisfb_ioctl(struct inode *inode, struct file *file, | 734 | static int sisfb_ioctl(struct inode *inode, struct file *file, |
731 | unsigned int cmd, unsigned long arg, | 735 | unsigned int cmd, unsigned long arg, |
732 | struct fb_info *info); | 736 | struct fb_info *info); |
737 | #endif | ||
733 | static int sisfb_set_par(struct fb_info *info); | 738 | static int sisfb_set_par(struct fb_info *info); |
734 | static int sisfb_blank(int blank, | 739 | static int sisfb_blank(int blank, |
735 | struct fb_info *info); | 740 | struct fb_info *info); |