[src/pgoyette-compat]: src/sys/sys Resolve conflict correctly!

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

details:   https://anonhg.NetBSD.org/src/rev/dc00fe1b719e
branches:  pgoyette-compat
changeset: 830594:dc00fe1b719e
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Jun 25 10:11:21 2018 +0000

description:
Resolve conflict correctly!

diffstat:

 sys/sys/module.h |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r ac1122272f0a -r dc00fe1b719e sys/sys/module.h
--- a/sys/sys/module.h  Mon Jun 25 08:50:10 2018 +0000
+++ b/sys/sys/module.h  Mon Jun 25 10:11:21 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: module.h,v 1.41.14.9 2018/06/25 07:22:54 pgoyette Exp $        */
+/*     $NetBSD: module.h,v 1.41.14.10 2018/06/25 10:11:21 pgoyette Exp $       */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -250,8 +250,9 @@
 enum modctl {
        MODCTL_LOAD,            /* modctl_load_t *ml */
        MODCTL_UNLOAD,          /* char *name */
-       MODCTL_STAT,            /* struct iovec *buffer */
-       MODCTL_EXISTS           /* enum: 0: load, 1: autoload */
+       MODCTL_OSTAT,           /* struct iovec *buffer */
+       MODCTL_EXISTS,          /* enum: 0: load, 1: autoload */
+       MODCTL_STAT             /* struct iovec *buffer */
 };
 
 /*