diff options
| author | David Teigland <teigland@redhat.com> | 2006-01-18 09:14:51 (GMT) |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-01-18 09:14:51 (GMT) |
| commit | 2ff4782374dde5e3d76daf8a82eae396c0f76567 (patch) | |
| tree | 42cc821174a3f3f410895fce16741948a1103e66 /drivers/video/sbuslib.h | |
| parent | cd1344fe322cd9d95b2c0f011d6766677cfcb29b (diff) | |
| parent | 7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff) | |
| download | linux-2ff4782374dde5e3d76daf8a82eae396c0f76567.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/sbuslib.h')
| -rw-r--r-- | drivers/video/sbuslib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/sbuslib.h b/drivers/video/sbuslib.h index b470e52..492828c 100644 --- a/drivers/video/sbuslib.h +++ b/drivers/video/sbuslib.h @@ -20,7 +20,7 @@ extern int sbusfb_mmap_helper(struct sbus_mmap_map *map, int sbusfb_ioctl_helper(unsigned long cmd, unsigned long arg, struct fb_info *info, int type, int fb_depth, unsigned long fb_size); -long sbusfb_compat_ioctl(struct file *file, unsigned int cmd, - unsigned long arg, struct fb_info *info); +int sbusfb_compat_ioctl(struct fb_info *info, unsigned int cmd, + unsigned long arg); #endif /* _SBUSLIB_H */ |