Module Name: src
Committed By: pgoyette
Date: Mon Jun 25 10:11:21 UTC 2018
Modified Files:
src/sys/sys [pgoyette-compat]: module.h
Log Message:
Resolve conflict correctly!
To generate a diff of this commit:
cvs rdiff -u -r1.41.14.9 -r1.41.14.10 src/sys/sys/module.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/module.h
diff -u src/sys/sys/module.h:1.41.14.9 src/sys/sys/module.h:1.41.14.10
--- src/sys/sys/module.h:1.41.14.9 Mon Jun 25 07:22:54 2018
+++ src/sys/sys/module.h Mon Jun 25 10:11:21 2018
@@ -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 @@ typedef struct modctl_load {
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 */
};
/*
