[src/trunk]: src/external/cddl/osnet/dist/uts/common/dtrace fix a merge botch...

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a498b02f12c5
branches:  trunk
changeset: 767655:a498b02f12c5
user:      yamt <yamt%NetBSD.org@localhost>
date:      Tue Jul 26 12:33:23 2011 +0000

description:
fix a merge botch in rev.1.7

diffstat:

 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r f10738f5fb92 -r a498b02f12c5 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Tue Jul 26 12:28:39 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Tue Jul 26 12:33:23 2011 +0000
@@ -355,7 +355,7 @@
 #else
        (void (*)(void *, dtrace_modctl_t *))dtrace_nullop,
 #endif
-       (int (*)(void *, dtrace_id_t, void *))dtrace_nullop,
+       (int (*)(void *, dtrace_id_t, void *))dtrace_enable_nullop,
        (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
        (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,
        (void (*)(void *, dtrace_id_t, void *))dtrace_nullop,