diff options
Diffstat (limited to 'drivers/video/intelfb/intelfbdrv.c')
-rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 0090544842f5..6b8bd3cdf9c0 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -157,9 +157,8 @@ static int intelfb_cursor(struct fb_info *info, | |||
157 | 157 | ||
158 | static int intelfb_sync(struct fb_info *info); | 158 | static int intelfb_sync(struct fb_info *info); |
159 | 159 | ||
160 | static int intelfb_ioctl(struct inode *inode, struct file *file, | 160 | static int intelfb_ioctl(struct fb_info *info, |
161 | unsigned int cmd, unsigned long arg, | 161 | unsigned int cmd, unsigned long arg); |
162 | struct fb_info *info); | ||
163 | 162 | ||
164 | static int __devinit intelfb_pci_register(struct pci_dev *pdev, | 163 | static int __devinit intelfb_pci_register(struct pci_dev *pdev, |
165 | const struct pci_device_id *ent); | 164 | const struct pci_device_id *ent); |
@@ -1380,8 +1379,7 @@ intelfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) | |||
1380 | 1379 | ||
1381 | /* When/if we have our own ioctls. */ | 1380 | /* When/if we have our own ioctls. */ |
1382 | static int | 1381 | static int |
1383 | intelfb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | 1382 | intelfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) |
1384 | unsigned long arg, struct fb_info *info) | ||
1385 | { | 1383 | { |
1386 | int retval = 0; | 1384 | int retval = 0; |
1387 | 1385 | ||