diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2010-12-06 22:11:02 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2010-12-06 22:11:02 +0000 |
| commit | a71c133efb7026da05ac2f7f41a6926bc5824a63 (patch) | |
| tree | caa8cefa19803b9912219905c5cc1f2499bb0544 /sys/arch/amd64/stand/boot | |
| parent | 2131988aa3472105a2067d04c42151159fe3515d (diff) | |
- partially revert previous NENTS removal for arches which got busted.
Diffstat (limited to 'sys/arch/amd64/stand/boot')
| -rw-r--r-- | sys/arch/amd64/stand/boot/conf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c index 724c6cd3c4a..e5416d18a98 100644 --- a/sys/arch/amd64/stand/boot/conf.c +++ b/sys/arch/amd64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.16 2010/12/06 18:44:49 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.17 2010/12/06 22:11:01 jasper Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -56,10 +56,10 @@ void (*i386_probe2[])(void) = { }; struct i386_boot_probes probe_list[] = { - { "probing", i386_probe1, nitems(i386_probe1) }, - { "disk", i386_probe2, nitems(i386_probe2) } + { "probing", i386_probe1, NENTS(i386_probe1) }, + { "disk", i386_probe2, NENTS(i386_probe2) } }; -int nibprobes = nitems(probe_list); +int nibprobes = NENTS(probe_list); struct fs_ops file_system[] = { @@ -74,7 +74,7 @@ struct fs_ops file_system[] = { cd9660_stat, cd9660_readdir }, #endif }; -int nfsys = nitems(file_system); +int nfsys = NENTS(file_system); struct devsw devsw[] = { { "BIOS", biosstrategy, biosopen, biosclose, biosioctl }, @@ -82,7 +82,7 @@ struct devsw devsw[] = { { "TFTP", tftpstrategy, tftpopen, tftpclose, tftpioctl }, #endif }; -int ndevs = nitems(devsw); +int ndevs = NENTS(devsw); struct consdev constab[] = { { pc_probe, pc_init, pc_getc, pc_putc }, |