Module Name:    src
Committed By:   pgoyette
Date:           Thu Apr 23 23:22:52 UTC 2015

Modified Files:
        src/sys/arch/aarch64/conf: majors.aarch64
        src/sys/arch/alpha/conf: majors.alpha
        src/sys/arch/amd64/conf: majors.amd64
        src/sys/arch/arm/conf: majors.arm32
        src/sys/arch/epoc32/conf: majors.epoc32
        src/sys/arch/evbmips/conf: majors.evbmips
        src/sys/arch/evbppc/conf: majors.evbppc
        src/sys/arch/hpcarm/conf: majors.hpcarm
        src/sys/arch/hppa/conf: majors.hppa
        src/sys/arch/i386/conf: majors.i386
        src/sys/arch/ia64/conf: majors.ia64
        src/sys/arch/landisk/conf: majors.landisk
        src/sys/arch/mac68k/conf: majors.mac68k
        src/sys/arch/or1k/conf: majors.or1k
        src/sys/arch/powerpc/conf: majors.powerpc
        src/sys/arch/sgimips/conf: majors.sgimips
        src/sys/arch/sparc/conf: majors.sparc
        src/sys/arch/sparc64/conf: majors.sparc64
        src/sys/arch/x68k/conf: majors.x68k
        src/sys/arch/zaurus/conf: majors.zaurus
        src/sys/conf: majors.std

Log Message:
Update device dependency information - the sysmon major device now depends on 
the sysmon module itself, not on the individual components.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/conf/majors.aarch64
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/alpha/conf/majors.alpha
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amd64/conf/majors.amd64
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/conf/majors.arm32
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/conf/majors.epoc32
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbmips/conf/majors.evbmips
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbppc/conf/majors.evbppc
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hpcarm/conf/majors.hpcarm
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/conf/majors.hppa
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/i386/conf/majors.i386
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/conf/majors.ia64
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/landisk/conf/majors.landisk
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mac68k/conf/majors.mac68k
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/or1k/conf/majors.or1k
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/conf/majors.powerpc
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sgimips/conf/majors.sgimips
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sparc/conf/majors.sparc
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sparc64/conf/majors.sparc64
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x68k/conf/majors.x68k
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/conf/majors.zaurus
cvs rdiff -u -r1.2 -r1.3 src/sys/conf/majors.std

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/aarch64/conf/majors.aarch64
diff -u src/sys/arch/aarch64/conf/majors.aarch64:1.1 src/sys/arch/aarch64/conf/majors.aarch64:1.2
--- src/sys/arch/aarch64/conf/majors.aarch64:1.1	Sun Aug 10 05:47:37 2014
+++ src/sys/arch/aarch64/conf/majors.aarch64	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: majors.aarch64,v 1.1 2014/08/10 05:47:37 matt Exp $
+# $NetBSD: majors.aarch64,v 1.2 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for arm32
 #
@@ -93,7 +93,7 @@ device-major	cir		char 96			cir
 device-major	radio		char 97			radio
 device-major	kttcp		char 99			kttcp
 device-major	ixpcom		char 100		ixpcom
-device-major	sysmon		char 101		sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 101		sysmon
 device-major	dmoverio	char 102		dmoverio
 device-major	apm		char 103		apm
 device-major	sscom		char 104		sscom

Index: src/sys/arch/alpha/conf/majors.alpha
diff -u src/sys/arch/alpha/conf/majors.alpha:1.28 src/sys/arch/alpha/conf/majors.alpha:1.29
--- src/sys/arch/alpha/conf/majors.alpha:1.28	Tue Oct 15 19:22:42 2013
+++ src/sys/arch/alpha/conf/majors.alpha	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.alpha,v 1.28 2013/10/15 19:22:42 jdc Exp $
+#	$NetBSD: majors.alpha,v 1.29 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for alpha
 #
@@ -76,7 +76,7 @@ device-major	wsfont		char 76			wsfont
 device-major	nsmb		char 77			nsmb
 device-major	joy		char 78			joy
 device-major	twe		char 79			twe
-device-major	sysmon		char 80			sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 80			sysmon
 
 # Majors up to 143 are reserved for machine-dependent drivers.
 # New machine-independent driver majors are assigned in 

Index: src/sys/arch/amd64/conf/majors.amd64
diff -u src/sys/arch/amd64/conf/majors.amd64:1.24 src/sys/arch/amd64/conf/majors.amd64:1.25
--- src/sys/arch/amd64/conf/majors.amd64:1.24	Thu Jun 30 20:09:18 2011
+++ src/sys/arch/amd64/conf/majors.amd64	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.amd64,v 1.24 2011/06/30 20:09:18 wiz Exp $
+#	$NetBSD: majors.amd64,v 1.25 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for amd64
 #
@@ -60,7 +60,7 @@ device-major	esh		char 63			esh
 device-major	ugen		char 64			ugen
 device-major	wsmux		char 65			wsmux
 device-major	ucom		char 66			ucom
-device-major	sysmon		char 67			sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 67			sysmon
 
 device-major	ld		char 69  block 19	ld
 device-major	urio		char 70			urio

Index: src/sys/arch/arm/conf/majors.arm32
diff -u src/sys/arch/arm/conf/majors.arm32:1.36 src/sys/arch/arm/conf/majors.arm32:1.37
--- src/sys/arch/arm/conf/majors.arm32:1.36	Fri Jan 23 12:34:09 2015
+++ src/sys/arch/arm/conf/majors.arm32	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.arm32,v 1.36 2015/01/23 12:34:09 hkenken Exp $
+#	$NetBSD: majors.arm32,v 1.37 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for arm32
 #
@@ -94,7 +94,7 @@ device-major	radio		char 97			radio
 device-major	ctcom		char 98			ctcom
 device-major	kttcp		char 99			kttcp
 device-major	ixpcom		char 100		ixpcom
-device-major	sysmon		char 101		sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 101		sysmon
 device-major	dmoverio	char 102		dmoverio
 device-major	apm		char 103		apm
 device-major	sscom		char 104		sscom

Index: src/sys/arch/epoc32/conf/majors.epoc32
diff -u src/sys/arch/epoc32/conf/majors.epoc32:1.1 src/sys/arch/epoc32/conf/majors.epoc32:1.2
--- src/sys/arch/epoc32/conf/majors.epoc32:1.1	Sun Apr 28 12:11:25 2013
+++ src/sys/arch/epoc32/conf/majors.epoc32	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.epoc32,v 1.1 2013/04/28 12:11:25 kiyohara Exp $
+#	$NetBSD: majors.epoc32,v 1.2 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for epoc32
 #
@@ -93,7 +93,7 @@ device-major	cir		char 96			cir
 device-major	radio		char 97			radio
 device-major	kttcp		char 99			kttcp
 device-major	ixpcom		char 100		ixpcom
-device-major	sysmon		char 101		sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 101		sysmon
 device-major	dmoverio	char 102		dmoverio
 device-major	apmdev		char 103		apmdev
 device-major	sscom		char 104		sscom

Index: src/sys/arch/evbmips/conf/majors.evbmips
diff -u src/sys/arch/evbmips/conf/majors.evbmips:1.28 src/sys/arch/evbmips/conf/majors.evbmips:1.29
--- src/sys/arch/evbmips/conf/majors.evbmips:1.28	Fri Apr 26 18:35:43 2013
+++ src/sys/arch/evbmips/conf/majors.evbmips	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.evbmips,v 1.28 2013/04/26 18:35:43 christos Exp $
+#	$NetBSD: majors.evbmips,v 1.29 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for evbmips
 #
@@ -73,7 +73,7 @@ device-major	wsfont		char 72			wsfont
 # obsolete, probably can be safely removed after 4.0 branch
 #device-major	aucom		char 73			aucom
 
-device-major	sysmon		char 74			sysmon_envsys | sysmon_wdog
+device-major	sysmon		char 74			sysmon
 device-major	cgd		char 75  block 18	cgd
 device-major	ksyms		char 76			ksyms
 device-major	uart		char 77			uart

Index: src/sys/arch/evbppc/conf/majors.evbppc
diff -u src/sys/arch/evbppc/conf/majors.evbppc:1.31 src/sys/arch/evbppc/conf/majors.evbppc:1.32
--- src/sys/arch/evbppc/conf/majors.evbppc:1.31	Thu Jun 30 20:09:29 2011
+++ src/sys/arch/evbppc/conf/majors.evbppc	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.evbppc,v 1.31 2011/06/30 20:09:29 wiz Exp $
+#	$NetBSD: majors.evbppc,v 1.32 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for evbppc
 # (When possible, make entries the same as macppc)
@@ -63,7 +63,7 @@ device-major	isdntel		char 58			isdntel
 device-major	ld		char 59  block 13	ld
 device-major	pci		char 60			pci
 device-major	clockctl	char 61			clockctl
-device-major	sysmon		char 62			sysmon_envsys | sysmon_wdog
+device-major	sysmon		char 62			sysmon
 #				char 64
 device-major	kttcp		char 65			kttcp
 device-major	cgd		char 66  block 14	cgd

Index: src/sys/arch/hpcarm/conf/majors.hpcarm
diff -u src/sys/arch/hpcarm/conf/majors.hpcarm:1.12 src/sys/arch/hpcarm/conf/majors.hpcarm:1.13
--- src/sys/arch/hpcarm/conf/majors.hpcarm:1.12	Thu Jun 30 20:09:30 2011
+++ src/sys/arch/hpcarm/conf/majors.hpcarm	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.hpcarm,v 1.12 2011/06/30 20:09:30 wiz Exp $
+#	$NetBSD: majors.hpcarm,v 1.13 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for hpcarm
 #
@@ -93,7 +93,7 @@ device-major	cir		char 96			cir
 device-major	radio		char 97			radio
 device-major	kttcp		char 99			kttcp
 device-major	ixpcom		char 100		ixpcom
-device-major	sysmon		char 101		sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 101		sysmon
 device-major	dmoverio	char 102		dmoverio
 device-major	apmdev		char 103		apmdev
 device-major	sscom		char 104		sscom

Index: src/sys/arch/hppa/conf/majors.hppa
diff -u src/sys/arch/hppa/conf/majors.hppa:1.1 src/sys/arch/hppa/conf/majors.hppa:1.2
--- src/sys/arch/hppa/conf/majors.hppa:1.1	Mon Feb 24 07:23:42 2014
+++ src/sys/arch/hppa/conf/majors.hppa	Thu Apr 23 23:22:51 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.hppa,v 1.1 2014/02/24 07:23:42 skrll Exp $
+#	$NetBSD: majors.hppa,v 1.2 2015/04/23 23:22:51 pgoyette Exp $
 #
 # Device majors for hppa
 #
@@ -45,7 +45,7 @@ device-major	audio		char 40			audio
 device-major	ses		char 41			ses
 device-major	pci		char 42			pci
 device-major	wd		char 43  block 11	wd
-device-major	sysmon          char 44                 sysmon_power
+device-major	sysmon          char 44                 sysmon
 
 device-major	nsmb		char 98			nsmb
 

Index: src/sys/arch/i386/conf/majors.i386
diff -u src/sys/arch/i386/conf/majors.i386:1.43 src/sys/arch/i386/conf/majors.i386:1.44
--- src/sys/arch/i386/conf/majors.i386:1.43	Sat Feb 25 10:55:28 2012
+++ src/sys/arch/i386/conf/majors.i386	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.i386,v 1.43 2012/02/25 10:55:28 shattered Exp $
+#	$NetBSD: majors.i386,v 1.44 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for i386
 #
@@ -65,7 +65,7 @@ device-major	esh		char 63			esh
 device-major	ugen		char 64			ugen
 device-major	wsmux		char 65			wsmux
 device-major	ucom		char 66			ucom
-device-major	sysmon		char 67			sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 67			sysmon
 
 device-major	ld		char 69  block 19	ld
 device-major	urio		char 70			urio

Index: src/sys/arch/ia64/conf/majors.ia64
diff -u src/sys/arch/ia64/conf/majors.ia64:1.10 src/sys/arch/ia64/conf/majors.ia64:1.11
--- src/sys/arch/ia64/conf/majors.ia64:1.10	Sun Mar  9 13:26:08 2014
+++ src/sys/arch/ia64/conf/majors.ia64	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.ia64,v 1.10 2014/03/09 13:26:08 blymn Exp $
+#	$NetBSD: majors.ia64,v 1.11 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for ia64
 #
@@ -65,7 +65,7 @@ device-major	esh		char 63			esh
 device-major	ugen		char 64			ugen
 device-major	wsmux		char 65			wsmux
 device-major	ucom		char 66			ucom
-device-major	sysmon		char 67			sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 67			sysmon
 
 device-major	ld		char 69  block 19	ld
 device-major	urio		char 70			urio

Index: src/sys/arch/landisk/conf/majors.landisk
diff -u src/sys/arch/landisk/conf/majors.landisk:1.7 src/sys/arch/landisk/conf/majors.landisk:1.8
--- src/sys/arch/landisk/conf/majors.landisk:1.7	Thu Jun 30 20:09:32 2011
+++ src/sys/arch/landisk/conf/majors.landisk	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.landisk,v 1.7 2011/06/30 20:09:32 wiz Exp $
+#	$NetBSD: majors.landisk,v 1.8 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for landisk
 #
@@ -43,7 +43,7 @@ device-major	esh		char 50			esh
 device-major	wdog		char 51			wdog
 device-major	clockctl	char 52			clockctl
 device-major	cgd		char 54  block 19	cgd
-device-major	sysmon		char 55			sysmon_power | sysmon_wdog
+device-major	sysmon		char 55			sysmon
 
 device-major	wsdisplay	char 56			wsdisplay
 device-major	wskbd		char 57			wskbd

Index: src/sys/arch/mac68k/conf/majors.mac68k
diff -u src/sys/arch/mac68k/conf/majors.mac68k:1.23 src/sys/arch/mac68k/conf/majors.mac68k:1.24
--- src/sys/arch/mac68k/conf/majors.mac68k:1.23	Mon Oct  3 19:22:59 2011
+++ src/sys/arch/mac68k/conf/majors.mac68k	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.mac68k,v 1.23 2011/10/03 19:22:59 hauke Exp $
+#	$NetBSD: majors.mac68k,v 1.24 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for mac68k
 #
@@ -49,7 +49,7 @@ device-major	cgd		char 51  block 23	cgd
 device-major	ksyms		char 52			ksyms
 device-major	wsfont		char 53			wsfont
 device-major	cpi		char 54			cpi
-device-major	sysmon		char 55			sysmon_wdog
+device-major	sysmon		char 55			sysmon
 
 device-major	nsmb		char 98			nsmb
 

Index: src/sys/arch/or1k/conf/majors.or1k
diff -u src/sys/arch/or1k/conf/majors.or1k:1.1 src/sys/arch/or1k/conf/majors.or1k:1.2
--- src/sys/arch/or1k/conf/majors.or1k:1.1	Wed Sep  3 19:34:26 2014
+++ src/sys/arch/or1k/conf/majors.or1k	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.or1k,v 1.1 2014/09/03 19:34:26 matt Exp $
+#	$NetBSD: majors.or1k,v 1.2 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for OpenRISC 1000
 #
@@ -14,7 +14,7 @@ device-major	pts		char 7			pty
 device-major	clockctl	char 8			clockctl
 device-major	rnd		char 9			rnd
 device-major	ksyms		char 10			ksyms
-device-major	sysmon		char 11			sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 11			sysmon
 device-major	kttcp		char 12			kttcp
 device-major	bpf		char 13			bpfilter
 device-major	tun		char 14			tun

Index: src/sys/arch/powerpc/conf/majors.powerpc
diff -u src/sys/arch/powerpc/conf/majors.powerpc:1.8 src/sys/arch/powerpc/conf/majors.powerpc:1.9
--- src/sys/arch/powerpc/conf/majors.powerpc:1.8	Thu Jun 30 20:09:34 2011
+++ src/sys/arch/powerpc/conf/majors.powerpc	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.powerpc,v 1.8 2011/06/30 20:09:34 wiz Exp $
+#	$NetBSD: majors.powerpc,v 1.9 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for shared PowerPC
 #
@@ -68,7 +68,7 @@ device-major	ld		char 59  block 13	ld
 
 device-major	pci		char 60			pci
 device-major	clockctl	char 61			clockctl
-device-major	sysmon		char 62			sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 62			sysmon
 device-major	apm		char 64			apm
 device-major	kttcp		char 65			kttcp
 device-major	cgd		char 66  block 14	cgd

Index: src/sys/arch/sgimips/conf/majors.sgimips
diff -u src/sys/arch/sgimips/conf/majors.sgimips:1.27 src/sys/arch/sgimips/conf/majors.sgimips:1.28
--- src/sys/arch/sgimips/conf/majors.sgimips:1.27	Thu Jun 30 20:09:35 2011
+++ src/sys/arch/sgimips/conf/majors.sgimips	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.sgimips,v 1.27 2011/06/30 20:09:35 wiz Exp $
+#	$NetBSD: majors.sgimips,v 1.28 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for sgimips
 #
@@ -66,7 +66,7 @@ device-major	sequencer	char 75			sequenc
 device-major	uscanner	char 76			uscanner
 device-major	ksyms		char 77			ksyms
 device-major	lpt		char 78			lpt
-device-major    sysmon          char 79                 sysmon_envsys | sysmon_wdog
+device-major    sysmon          char 79                 sysmon
 device-major	nsmb		char 98			nsmb
 
 # Majors up to 143 are reserved for machine-dependent drivers.

Index: src/sys/arch/sparc/conf/majors.sparc
diff -u src/sys/arch/sparc/conf/majors.sparc:1.33 src/sys/arch/sparc/conf/majors.sparc:1.34
--- src/sys/arch/sparc/conf/majors.sparc:1.33	Thu Jun 30 20:09:36 2011
+++ src/sys/arch/sparc/conf/majors.sparc	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.sparc,v 1.33 2011/06/30 20:09:36 wiz Exp $
+#	$NetBSD: majors.sparc,v 1.34 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for sparc
 #
@@ -112,7 +112,7 @@ device-major	dmoverio	char 129		dmoverio
 device-major	dpt		char 132		dpt
 device-major	twe		char 133		twe
 device-major	nsmb		char 134		nsmb		
-device-major	sysmon		char 135		sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 135		sysmon
 
 device-major	ksyms		char 136		ksyms
 

Index: src/sys/arch/sparc64/conf/majors.sparc64
diff -u src/sys/arch/sparc64/conf/majors.sparc64:1.32 src/sys/arch/sparc64/conf/majors.sparc64:1.33
--- src/sys/arch/sparc64/conf/majors.sparc64:1.32	Thu Jun 30 20:09:36 2011
+++ src/sys/arch/sparc64/conf/majors.sparc64	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.sparc64,v 1.32 2011/06/30 20:09:36 wiz Exp $
+#	$NetBSD: majors.sparc64,v 1.33 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for sparc64
 #
@@ -109,7 +109,7 @@ device-major	dmoverio	char 129		dmoverio
 device-major	dpt		char 132		dpt
 device-major	twe		char 133		twe
 device-major	nsmb		char 134		nsmb		
-device-major	sysmon		char 135		sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 135		sysmon
 
 device-major	ksyms		char 136		ksyms
 

Index: src/sys/arch/x68k/conf/majors.x68k
diff -u src/sys/arch/x68k/conf/majors.x68k:1.26 src/sys/arch/x68k/conf/majors.x68k:1.27
--- src/sys/arch/x68k/conf/majors.x68k:1.26	Sun Apr 29 07:17:11 2012
+++ src/sys/arch/x68k/conf/majors.x68k	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.x68k,v 1.26 2012/04/29 07:17:11 tsutsui Exp $
+#	$NetBSD: majors.x68k,v 1.27 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for x68k
 #
@@ -57,7 +57,7 @@ device-major	ulpt		char 57			ulpt
 device-major	ucom		char 58			ucom
 device-major	urio		char 59			urio
 device-major	uscanner	char 60			uscanner
-device-major	sysmon		char 61			sysmon_power
+device-major	sysmon		char 61			sysmon
 device-major	nsmb		char 98			nsmb
 
 # Majors up to 143 are reserved for machine-dependent drivers.

Index: src/sys/arch/zaurus/conf/majors.zaurus
diff -u src/sys/arch/zaurus/conf/majors.zaurus:1.6 src/sys/arch/zaurus/conf/majors.zaurus:1.7
--- src/sys/arch/zaurus/conf/majors.zaurus:1.6	Thu Jun 30 20:09:38 2011
+++ src/sys/arch/zaurus/conf/majors.zaurus	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.zaurus,v 1.6 2011/06/30 20:09:38 wiz Exp $
+#	$NetBSD: majors.zaurus,v 1.7 2015/04/23 23:22:52 pgoyette Exp $
 #
 # Device majors for zaurus
 #
@@ -93,7 +93,7 @@ device-major	cir		char 96			cir
 device-major	radio		char 97			radio
 device-major	kttcp		char 99			kttcp
 device-major	ixpcom		char 100		ixpcom
-device-major	sysmon		char 101		sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 101		sysmon
 device-major	dmoverio	char 102		dmoverio
 device-major	apmdev		char 103		apmdev
 device-major	sscom		char 104		sscom

Index: src/sys/conf/majors.std
diff -u src/sys/conf/majors.std:1.2 src/sys/conf/majors.std:1.3
--- src/sys/conf/majors.std:1.2	Sun Apr 19 09:20:54 2015
+++ src/sys/conf/majors.std	Thu Apr 23 23:22:52 2015
@@ -1,4 +1,4 @@
-# $NetBSD: majors.std,v 1.2 2015/04/19 09:20:54 pgoyette Exp $
+# $NetBSD: majors.std,v 1.3 2015/04/23 23:22:52 pgoyette Exp $
 #
 # MI major assignments for standard devices
 #
@@ -12,5 +12,5 @@ device-major	log		char 246
 device-major	filedesc	char 247
 device-major	rnd		char 248		rnd
 device-major	clockctl	char 249		clockctl
-device-major	sysmon		char 250		sysmon_envsys | sysmon_wdog | sysmon_power
+device-major	sysmon		char 250		sysmon
 device-major	ksyms		char 251		ksyms

Reply via email to