[src/netbsd-7]: src/sys/arch Change the following, requested by snj in ticket...

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

details:   https://anonhg.NetBSD.org/src/rev/7bd4c328d413
branches:  netbsd-7
changeset: 798869:7bd4c328d413
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jan 20 20:40:50 2015 +0000

description:
Change the following, requested by snj in ticket #438:

sys/arch/i386/conf/GENERIC      patch
sys/arch/amd64/conf/GENERIC     patch

Remove the i915drm driver since the version we use doesn't support UMS
anymore, so X will fail to start. Without it, at least the vesa driver
will work.

diffstat:

 sys/arch/amd64/conf/GENERIC |  6 +++---
 sys/arch/i386/conf/GENERIC  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r acffd76fc622 -r 7bd4c328d413 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue Jan 20 09:51:39 2015 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue Jan 20 20:40:50 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.4 2014/11/18 19:05:28 snj Exp $
+# $NetBSD: GENERIC,v 1.392.2.5 2015/01/20 20:40:50 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.392.2.4 $"
+#ident                 "GENERIC-$Revision: 1.392.2.5 $"
 
 maxusers       64              # estimated number of users
 
@@ -384,7 +384,7 @@
 sysbeep0       at pcppi?
 
 # DRI driver
-i915drm*       at drm?         # Intel i915, i945 DRM driver
+#i915drm*      at drm?         # Intel i915, i945 DRM driver
 mach64drm*     at drm?         # mach64 (3D Rage Pro, Rage) DRM driver
 mgadrm*        at drm?         # Matrox G[24]00, G[45]50 DRM driver
 r128drm*       at drm?         # ATI Rage 128 DRM driver
diff -r acffd76fc622 -r 7bd4c328d413 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Tue Jan 20 09:51:39 2015 +0000
+++ b/sys/arch/i386/conf/GENERIC        Tue Jan 20 20:40:50 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107.2.3 2014/11/18 19:05:30 snj Exp $
+# $NetBSD: GENERIC,v 1.1107.2.4 2015/01/20 20:40:50 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.1107.2.3 $"
+#ident                 "GENERIC-$Revision: 1.1107.2.4 $"
 
 maxusers       64              # estimated number of users
 
@@ -555,7 +555,7 @@
 sysbeep0       at pcppi?
 
 # DRI driver
-i915drm*       at drm?         # Intel i915, i945 DRM driver
+#i915drm*      at drm?         # Intel i915, i945 DRM driver
 mach64drm*     at drm?         # mach64 (3D Rage Pro, Rage) DRM driver
 mgadrm*        at drm?         # Matrox G[24]00, G[45]50 DRM driver
 r128drm*       at drm?         # ATI Rage 128 DRM driver