Module Name: src
Committed By: christos
Date: Sat Sep 26 03:31:53 UTC 2015
Modified Files:
src/sys/dev/sun: disklabel.h
Log Message:
avoid conflicts with our own ioctls
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/sun/disklabel.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/dev/sun/disklabel.h
diff -u src/sys/dev/sun/disklabel.h:1.5 src/sys/dev/sun/disklabel.h:1.6
--- src/sys/dev/sun/disklabel.h:1.5 Sun Sep 6 02:01:01 2015
+++ src/sys/dev/sun/disklabel.h Fri Sep 25 23:31:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.5 2015/09/06 06:01:01 dholland Exp $ */
+/* $NetBSD: disklabel.h,v 1.6 2015/09/26 03:31:52 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -49,9 +49,9 @@
#define SUN_DKMAGIC 55998
/* These are the guys that Sun's dkinfo needs... */
-#define DKIOCGGEOM _IOR('d', 2, struct sun_dkgeom) /* geometry info */
-#define DKIOCINFO _IOR('d', 8, struct sun_dkctlr) /* controller info */
-#define DKIOCGPART _IOR('d', 4, struct sun_dkpart) /* partition info */
+#define SUN_DKIOCGGEOM _IOR('d', 2, struct sun_dkgeom) /* geometry info */
+#define SUN_DKIOCINFO _IOR('d', 8, struct sun_dkctlr) /* controller info */
+#define SUN_DKIOCGPART _IOR('d', 4, struct sun_dkpart) /* partition info */
/* geometry info */
struct sun_dkgeom {
