Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / video / radeonfb.c

diff --git a/drivers/video/radeonfb.c b/drivers/video/radeonfb.c
index 600318f708f294e2aafd4e2c04aa9767778735b8..afb6c2ead599dacbc61c350e8939fe036d4098a0 100644 (file)
--- a/drivers/video/radeonfb.c
+++ b/drivers/video/radeonfb.c
@@ -759,7 +759,7 @@ static void __iomem *radeon_find_rom(struct radeonfb_info *rinfo)
                 rom = rom_base;
         
                 for (i = 0; (i < 512) && (stage != 4); i++) {
-                    for(j = 0;j < sizeof(radeon_sig)/sizeof(char *);j++) {
+                    for (j = 0; j < ARRAY_SIZE(radeon_sig); j++) {
                         if (radeon_sig[j][0] == *rom)
                                 if (strncmp(radeon_sig[j], rom,
                                             strlen(radeon_sig[j])) == 0) {
@@ -1497,8 +1497,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 = (struct radeonfb_info *) info;
        unsigned int tmp;
@@ -1596,7 +1596,7 @@ static int radeonfb_blank (int blank, struct fb_info *info)
                return 0;
                
 #ifdef CONFIG_PMAC_BACKLIGHT
-       if (rinfo->dviDisp_type == MT_LCD && _machine == _MACH_Pmac) {
+       if (rinfo->dviDisp_type == MT_LCD && machine_is(powermac)) {
                set_backlight_enable(!blank);
                return 0;
        }