diff options
author | Len Brown <len.brown@intel.com> | 2006-01-27 23:18:29 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-27 23:18:29 +0100 |
commit | 292dd876ee765c478b27c93cc51e93a558ed58bf (patch) | |
tree | 5b740e93253295baee2a9c414a6c66d03d44a9ef /drivers/video/aty/radeon_base.c | |
parent | [ACPI] remove "Resource isn't an IRQ" warning (diff) | |
parent | [ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi bran... (diff) | |
download | linux-292dd876ee765c478b27c93cc51e93a558ed58bf.tar.xz linux-292dd876ee765c478b27c93cc51e93a558ed58bf.zip |
Pull release into acpica branch
Diffstat (limited to 'drivers/video/aty/radeon_base.c')
-rw-r--r-- | drivers/video/aty/radeon_base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index 156db84cb363..c9f0c5a07e6e 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c @@ -864,8 +864,8 @@ static int radeonfb_pan_display (struct fb_var_screeninfo *var, } -static int radeonfb_ioctl (struct inode *inode, struct file *file, unsigned int cmd, - unsigned long arg, struct fb_info *info) +static int radeonfb_ioctl (struct fb_info *info, unsigned int cmd, + unsigned long arg) { struct radeonfb_info *rinfo = info->par; unsigned int tmp; |