Merge branch 'upstream'

[sfrench/cifs-2.6.git] / drivers / video / macmodes.c

diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c
index 2fc71081f7e7077749ff659ec9176d0c7f75f6c1..c0385c6f7db57fdac748e421e590ab10a6e58605 100644 (file)
--- a/drivers/video/macmodes.c
+++ b/drivers/video/macmodes.c
@@ -380,7 +380,7 @@ int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
     if (mode_option && !strncmp(mode_option, "mac", 3)) {
        mode_option += 3;
        db = mac_modedb;
-       dbsize = sizeof(mac_modedb)/sizeof(*mac_modedb);
+       dbsize = ARRAY_SIZE(mac_modedb);
     }
     return fb_find_mode(var, info, mode_option, db, dbsize,
                        &mac_modedb[DEFAULT_MODEDB_INDEX], default_bpp);