CVS commit: [riastradh-drm2] src/sys/conf

2014-01-29 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Wed Jan 29 19:47:54 UTC 2014

Modified Files:
src/sys/conf [riastradh-drm2]: majors

Log Message:
Give drmkms its own device major so it doesn't compete with old drm.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.66.6.1 src/sys/conf/majors

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

Modified files:

Index: src/sys/conf/majors
diff -u src/sys/conf/majors:1.66 src/sys/conf/majors:1.66.6.1
--- src/sys/conf/majors:1.66	Mon Apr 22 16:49:14 2013
+++ src/sys/conf/majors	Wed Jan 29 19:47:54 2014
@@ -1,4 +1,4 @@
-# $NetBSD: majors,v 1.66 2013/04/22 16:49:14 rkujawa Exp $
+# $NetBSD: majors,v 1.66.6.1 2014/01/29 19:47:54 riastradh Exp $
 #
 # Device majors for Machine-Independent drivers.
 #
@@ -54,3 +54,4 @@ device-major mfi   char 205		   mfi
 device-major seeprom   char 206		   seeprom
 device-major dtracechar 207		   dtrace
 device-major spiflash  char 208 block 208  spiflash
+device-major drmkmschar 209drmkms

CVS commit: [riastradh-drm2] src/sys/conf

2013-09-08 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Sun Sep  8 15:33:06 UTC 2013

Modified Files:
src/sys/conf [riastradh-drm2]: files

Log Message:
Restore config `drm' attribute in sys/conf/files.

Not sure why this started to be necessary after the merge, but
whatever...


To generate a diff of this commit:
cvs rdiff -u -r1.1077.2.1 -r1.1077.2.2 src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1077.2.1 src/sys/conf/files:1.1077.2.2
--- src/sys/conf/files:1.1077.2.1	Wed Jul 24 03:53:14 2013
+++ src/sys/conf/files	Sun Sep  8 15:33:06 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1077.2.1 2013/07/24 03:53:14 riastradh Exp $
+#	$NetBSD: files,v 1.1077.2.2 2013/09/08 15:33:06 riastradh Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -1093,7 +1093,7 @@ device	smsh: arp, ether, ifnet, mii
 file	dev/ic/lan9118.c		smsh
 
 # DRM - Direct Rendering Infrastructure: dev/drm
-#define drm {}
+define drm {}
 #include external/bsd/drm/conf/files.drm
 #include dev/drm/files.drm