diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/video/clgenfb.c | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/video/clgenfb.c')
| -rw-r--r-- | drivers/video/clgenfb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/clgenfb.c b/drivers/video/clgenfb.c index 57626f05c..e490910c9 100644 --- a/drivers/video/clgenfb.c +++ b/drivers/video/clgenfb.c @@ -99,8 +99,6 @@ #define assert(expr) #endif -#define arraysize(x) (sizeof(x)/sizeof(*(x))) - #ifdef TRUE #undef TRUE #endif @@ -450,7 +448,7 @@ static const struct { } }; -#define NUM_TOTAL_MODES arraysize(clgenfb_predefined) +#define NUM_TOTAL_MODES ARRAY_SIZE(clgenfb_predefined) static struct fb_var_screeninfo clgenfb_default; /* @@ -2431,7 +2429,7 @@ static struct pci_dev * __init clgen_pci_dev_get (clgen_board_t *btype) DPRINTK ("ENTER\n"); - for (i = 0; i < arraysize(clgen_pci_probe_list); i++) { + for (i = 0; i < ARRAY_SIZE(clgen_pci_probe_list); i++) { pdev = NULL; while ((pdev = pci_find_device (PCI_VENDOR_ID_CIRRUS, clgen_pci_probe_list[i].device, pdev)) != NULL) { @@ -2582,7 +2580,7 @@ static int __init clgen_zorro_find (struct zorro_dev **z_o, assert (z_o != NULL); assert (btype != NULL); - for (i = 0; i < arraysize(clgen_zorro_probe_list); i++) + for (i = 0; i < ARRAY_SIZE(clgen_zorro_probe_list); i++) if ((z = zorro_find_device(clgen_zorro_probe_list[i].id, NULL))) break; |