Module Name: src
Committed By: snj
Date: Wed Mar 18 03:57:16 UTC 2015
Modified Files:
src/etc/etc.amd64 [netbsd-7]: Makefile.inc
src/etc/etc.i386 [netbsd-7]: Makefile.inc
src/sys/arch/amd64/conf [netbsd-7]: ALL GENERIC INSTALL
src/sys/arch/i386/conf [netbsd-7]: ALL GENERIC INSTALL
src/usr.sbin/sysinst/arch/amd64 [netbsd-7]: md.h
src/usr.sbin/sysinst/arch/i386 [netbsd-7]: md.h msg.md.de msg.md.en
msg.md.es msg.md.fr msg.md.pl
Removed Files:
src/sys/arch/amd64/conf [netbsd-7]: DRMKMS NO_DRM
src/sys/arch/i386/conf [netbsd-7]: DRMKMS NO_DRM
Log Message:
Apply patch (requested by christos in ticket #542):
- Enable intel and radeon DRM/KMS drivers in GENERIC
- Disable all of the old DRM drivers in GENERIC
- Remove the separate DRMKMS kernel
To generate a diff of this commit:
cvs rdiff -u -r1.14.12.2 -r1.14.12.3 src/etc/etc.amd64/Makefile.inc
cvs rdiff -u -r1.67.12.2 -r1.67.12.3 src/etc/etc.i386/Makefile.inc
cvs rdiff -u -r1.13.2.1 -r1.13.2.2 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.8 -r0 src/sys/arch/amd64/conf/DRMKMS
cvs rdiff -u -r1.392.2.5 -r1.392.2.6 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.89.8.1 -r1.89.8.2 src/sys/arch/amd64/conf/INSTALL
cvs rdiff -u -r1.2.8.1 -r0 src/sys/arch/amd64/conf/NO_DRM
cvs rdiff -u -r1.380.2.1 -r1.380.2.2 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.6 -r0 src/sys/arch/i386/conf/DRMKMS
cvs rdiff -u -r1.1107.2.5 -r1.1107.2.6 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.330.30.1 -r1.330.30.2 src/sys/arch/i386/conf/INSTALL
cvs rdiff -u -r1.1.8.1 -r0 src/sys/arch/i386/conf/NO_DRM
cvs rdiff -u -r1.1.4.1 -r1.1.4.2 src/usr.sbin/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.1.4.1 -r1.1.4.2 src/usr.sbin/sysinst/arch/i386/md.h \
src/usr.sbin/sysinst/arch/i386/msg.md.de \
src/usr.sbin/sysinst/arch/i386/msg.md.en \
src/usr.sbin/sysinst/arch/i386/msg.md.es \
src/usr.sbin/sysinst/arch/i386/msg.md.fr \
src/usr.sbin/sysinst/arch/i386/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.amd64/Makefile.inc
diff -u src/etc/etc.amd64/Makefile.inc:1.14.12.2 src/etc/etc.amd64/Makefile.inc:1.14.12.3
--- src/etc/etc.amd64/Makefile.inc:1.14.12.2 Fri Feb 27 09:23:02 2015
+++ src/etc/etc.amd64/Makefile.inc Wed Mar 18 03:57:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14.12.2 2015/02/27 09:23:02 martin Exp $
+# $NetBSD: Makefile.inc,v 1.14.12.3 2015/03/18 03:57:15 snj Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -8,7 +8,6 @@
KERNEL_SETS= GENERIC
KERNEL_SETS+= XEN3_DOM0 XEN3_DOMU
-KERNEL_SETS+= DRMKMS
# KERNEL_SETS+= GENERIC_USERMODE
BUILD_KERNELS= INSTALL INSTALL_XEN3_DOMU
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.67.12.2 src/etc/etc.i386/Makefile.inc:1.67.12.3
--- src/etc/etc.i386/Makefile.inc:1.67.12.2 Mon Mar 9 09:06:04 2015
+++ src/etc/etc.i386/Makefile.inc Wed Mar 18 03:57:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.67.12.2 2015/03/09 09:06:04 snj Exp $
+# $NetBSD: Makefile.inc,v 1.67.12.3 2015/03/18 03:57:15 snj Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -8,7 +8,6 @@
KERNEL_SETS= GENERIC
KERNEL_SETS+= MONOLITHIC
-KERNEL_SETS+= DRMKMS
KERNEL_SETS+= LEGACY
KERNEL_SETS+= XEN3_DOM0
KERNEL_SETS+= XEN3_DOMU
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.13.2.1 src/sys/arch/amd64/conf/ALL:1.13.2.2
--- src/sys/arch/amd64/conf/ALL:1.13.2.1 Tue Nov 18 19:05:28 2014
+++ src/sys/arch/amd64/conf/ALL Wed Mar 18 03:57:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.13.2.1 2014/11/18 19:05:28 snj Exp $
+# $NetBSD: ALL,v 1.13.2.2 2015/03/18 03:57:15 snj Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.13.2.1 $"
+#ident "ALL-$Revision: 1.13.2.2 $"
maxusers 64 # estimated number of users
@@ -509,17 +509,27 @@ voodoofb* at pci? dev ? function ?
wcfb* at pci? dev ? function ?
wsdisplay* at wsemuldisplaydev?
-# DRI 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
-radeondrm* at drm? # ATI Radeon DRM driver
-savagedrm* at drm? # S3 Savage DRM driver
-sisdrm* at drm? # SiS DRM driver
-tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
-vboxdrm* at drm? # VirtualBox DRM driver
-viadrm* at drm? # VIA UniChrome DRM driver
+# DRI legacy drivers
+#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
+#radeondrm* at drm? # ATI Radeon DRM driver
+#savagedrm* at drm? # S3 Savage DRM driver
+#sisdrm* at drm? # SiS DRM driver
+#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
+#vboxdrm* at drm? # VirtualBox DRM driver
+#viadrm* at drm? # VIA UniChrome DRM driver
+
+# DRMKMS drivers
+i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
+
+radeon* at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+nouveau* at pci? dev ? function ?
+nouveaufb* at nouveaufbbus?
attimer0 at isa?
pcppi0 at isa?
@@ -2035,7 +2045,6 @@ options NOTDEF_DEBUG
options NOT_DEBUG
options NSIODEBUG
options NTFS_DEBUG
-options NV_DEBUG
options OBOE_DEBUG
options OFW_DEBUG
options OHCI_DEBUG
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.392.2.5 src/sys/arch/amd64/conf/GENERIC:1.392.2.6
--- src/sys/arch/amd64/conf/GENERIC:1.392.2.5 Tue Jan 20 20:40:50 2015
+++ src/sys/arch/amd64/conf/GENERIC Wed Mar 18 03:57:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.5 2015/01/20 20:40:50 martin Exp $
+# $NetBSD: GENERIC,v 1.392.2.6 2015/03/18 03:57:15 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.392.2.5 $"
+#ident "GENERIC-$Revision: 1.392.2.6 $"
maxusers 64 # estimated number of users
@@ -383,16 +383,26 @@ attimer0 at isa?
pcppi0 at isa?
sysbeep0 at pcppi?
-# DRI driver
+# DRI legacy drivers
#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
-radeondrm* at drm? # ATI Radeon DRM driver
-savagedrm* at drm? # S3 Savage DRM driver
-sisdrm* at drm? # SiS DRM driver
-tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
-viadrm* at drm? # VIA 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
+#radeondrm* at drm? # ATI Radeon DRM driver
+#savagedrm* at drm? # S3 Savage DRM driver
+#sisdrm* at drm? # SiS DRM driver
+#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
+#viadrm* at drm? # VIA DRM driver
+
+# DRMKMS drivers
+i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
+
+radeon* at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau* at pci? dev ? function ?
+#nouveaufb* at nouveaufbbus?
# Cryptographic Devices
Index: src/sys/arch/amd64/conf/INSTALL
diff -u src/sys/arch/amd64/conf/INSTALL:1.89.8.1 src/sys/arch/amd64/conf/INSTALL:1.89.8.2
--- src/sys/arch/amd64/conf/INSTALL:1.89.8.1 Fri Jan 23 09:01:45 2015
+++ src/sys/arch/amd64/conf/INSTALL Wed Mar 18 03:57:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.89.8.1 2015/01/23 09:01:45 martin Exp $
+# $NetBSD: INSTALL,v 1.89.8.2 2015/03/18 03:57:15 snj Exp $
#
# INSTALL - Installation kernel.
#
@@ -8,7 +8,7 @@
include "arch/amd64/conf/GENERIC"
options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200
-#ident "INSTALL-$Revision: 1.89.8.1 $"
+#ident "INSTALL-$Revision: 1.89.8.2 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -16,11 +16,7 @@ options MEMORY_DISK_SERVER=0 # no users
options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
-# DRI driver
-no mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
-no mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
-no r128drm* at drm? # ATI Rage 128 DRM driver
-no radeondrm* at drm? # ATI Radeon DRM driver
-no savagedrm* at drm? # S3 Savage DRM driver
-no sisdrm* at drm? # SiS DRM driver
-no tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
+# DRMKMS driver
+no i915drmkms* at pci?
+no radeon* at pci?
+#no nouveau* at pci?
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.380.2.1 src/sys/arch/i386/conf/ALL:1.380.2.2
--- src/sys/arch/i386/conf/ALL:1.380.2.1 Tue Nov 18 19:05:30 2014
+++ src/sys/arch/i386/conf/ALL Wed Mar 18 03:57:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.380.2.1 2014/11/18 19:05:30 snj Exp $
+# $NetBSD: ALL,v 1.380.2.2 2015/03/18 03:57:15 snj Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.380.2.1 $"
+#ident "ALL-$Revision: 1.380.2.2 $"
maxusers 64 # estimated number of users
@@ -588,17 +588,26 @@ voodoofb* at pci? dev ? function ?
wcfb* at pci? dev ? function ?
wsdisplay* at wsemuldisplaydev?
-# DRI 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
-radeondrm* at drm? # ATI Radeon DRM driver
-savagedrm* at drm? # S3 Savage DRM driver
-sisdrm* at drm? # SiS DRM driver
-tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
-vboxdrm* at drm? # VirtualBox DRM driver
-viadrm* at drm? # VIA UniChrome DRM driver
+# DRI legacy drivers
+#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
+#radeondrm* at drm? # ATI Radeon DRM driver
+#savagedrm* at drm? # S3 Savage DRM driver
+#sisdrm* at drm? # SiS DRM driver
+#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
+#vboxdrm* at drm? # VirtualBox DRM driver
+#viadrm* at drm? # VIA UniChrome DRM driver
+
+i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
+
+radeon* at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau* at pci? dev ? function ?
+#nouveaufb* at nouveaufbbus
attimer0 at isa?
pcppi0 at isa?
@@ -2236,7 +2245,6 @@ options NOTDEF_DEBUG
options NOT_DEBUG
options NSIODEBUG
options NTFS_DEBUG
-options NV_DEBUG
options OBOE_DEBUG
options OFW_DEBUG
options OHCI_DEBUG
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1107.2.5 src/sys/arch/i386/conf/GENERIC:1.1107.2.6
--- src/sys/arch/i386/conf/GENERIC:1.1107.2.5 Mon Mar 9 09:06:04 2015
+++ src/sys/arch/i386/conf/GENERIC Wed Mar 18 03:57:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107.2.5 2015/03/09 09:06:04 snj Exp $
+# $NetBSD: GENERIC,v 1.1107.2.6 2015/03/18 03:57:15 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1107.2.5 $"
+#ident "GENERIC-$Revision: 1.1107.2.6 $"
maxusers 64 # estimated number of users
@@ -555,16 +555,25 @@ attimer0 at isa?
pcppi0 at isa?
sysbeep0 at pcppi?
-# DRI driver
+# DRI legacy drivers
#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
-radeondrm* at drm? # ATI Radeon DRM driver
-savagedrm* at drm? # S3 Savage DRM driver
-sisdrm* at drm? # SiS DRM driver
-tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
-viadrm* at drm? # VIA 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
+#radeondrm* at drm? # ATI Radeon DRM driver
+#savagedrm* at drm? # S3 Savage DRM driver
+#sisdrm* at drm? # SiS DRM driver
+#tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
+#viadrm* at drm? # VIA DRM driver
+
+i915drmkms* at pci? dev ? function ?
+intelfb* at intelfbbus?
+
+radeon* at pci? dev ? function ?
+radeondrmkmsfb* at radeonfbbus?
+
+#nouveau* at pci? dev ? function ?
+#nouveaufb* at nouveaufbbus?
# Serial Devices
Index: src/sys/arch/i386/conf/INSTALL
diff -u src/sys/arch/i386/conf/INSTALL:1.330.30.1 src/sys/arch/i386/conf/INSTALL:1.330.30.2
--- src/sys/arch/i386/conf/INSTALL:1.330.30.1 Fri Jan 23 09:01:44 2015
+++ src/sys/arch/i386/conf/INSTALL Wed Mar 18 03:57:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.330.30.1 2015/01/23 09:01:44 martin Exp $
+# $NetBSD: INSTALL,v 1.330.30.2 2015/03/18 03:57:15 snj Exp $
#
# INSTALL - Installation kernel.
#
@@ -7,7 +7,7 @@
include "arch/i386/conf/MONOLITHIC"
-#ident "INSTALL-$Revision: 1.330.30.1 $"
+#ident "INSTALL-$Revision: 1.330.30.2 $"
no options MEMORY_DISK_DYNAMIC
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -15,12 +15,7 @@ options MEMORY_DISK_SERVER=0 # no users
options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
-# DRI driver
-no mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver
-no mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver
-no r128drm* at drm? # ATI Rage 128 DRM driver
-no radeondrm* at drm? # ATI Radeon DRM driver
-no savagedrm* at drm? # S3 Savage DRM driver
-no sisdrm* at drm? # SiS DRM driver
-no tdfxdrm* at drm? # 3dfx (voodoo) DRM driver
-no viadrm* at drm? # VIA DRM driver
+# DRMKMS driver
+no i915drmkms* at pci?
+no radeon* at pci?
+#no nouveau* at pci?
Index: src/usr.sbin/sysinst/arch/amd64/md.h
diff -u src/usr.sbin/sysinst/arch/amd64/md.h:1.1.4.1 src/usr.sbin/sysinst/arch/amd64/md.h:1.1.4.2
--- src/usr.sbin/sysinst/arch/amd64/md.h:1.1.4.1 Thu Dec 4 19:18:09 2014
+++ src/usr.sbin/sysinst/arch/amd64/md.h Wed Mar 18 03:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
+/* $NetBSD: md.h,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -80,10 +80,8 @@
* from floppy.
*/
#define SET_KERNEL_1_NAME "kern-GENERIC"
-#define SET_KERNEL_2_NAME "kern-DRMKMS"
#define SET_KERNEL_GENERIC SET_KERNEL_1
-#define SET_KERNEL_DRMKMS SET_KERNEL_2
/*
* Disk names accepted as valid targets for a from-scratch installation.
Index: src/usr.sbin/sysinst/arch/i386/md.h
diff -u src/usr.sbin/sysinst/arch/i386/md.h:1.1.4.1 src/usr.sbin/sysinst/arch/i386/md.h:1.1.4.2
--- src/usr.sbin/sysinst/arch/i386/md.h:1.1.4.1 Thu Dec 4 19:18:09 2014
+++ src/usr.sbin/sysinst/arch/i386/md.h Wed Mar 18 03:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
+/* $NetBSD: md.h,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -75,10 +75,8 @@
*/
#define SET_KERNEL_GENERIC SET_KERNEL_1
-#define SET_KERNEL_DRMKMS SET_KERNEL_2
#define SET_KERNEL_1_NAME "kern-GENERIC"
-#define SET_KERNEL_2_NAME "kern-DRMKMS"
/*
* Disk names accepted as valid targets for a from-scratch installation.
Index: src/usr.sbin/sysinst/arch/i386/msg.md.de
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.de:1.1.4.1 src/usr.sbin/sysinst/arch/i386/msg.md.de:1.1.4.2
--- src/usr.sbin/sysinst/arch/i386/msg.md.de:1.1.4.1 Thu Dec 4 19:18:09 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.de Wed Mar 18 03:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.de,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
+/* $NetBSD: msg.md.de,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -165,4 +165,3 @@ message updatembr
NetBSD Bootcodes updaten?}
message set_kernel_1 {Kernel (GENERIC)}
-message set_kernel_2 {Kernel (DRMKMS)}
Index: src/usr.sbin/sysinst/arch/i386/msg.md.en
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.en:1.1.4.1 src/usr.sbin/sysinst/arch/i386/msg.md.en:1.1.4.2
--- src/usr.sbin/sysinst/arch/i386/msg.md.en:1.1.4.1 Thu Dec 4 19:18:09 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.en Wed Mar 18 03:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
+/* $NetBSD: msg.md.en,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -161,4 +161,3 @@ message updatembr
the latest version of the NetBSD bootcode?}
message set_kernel_1 {Kernel (GENERIC)}
-message set_kernel_2 {Kernel (DRMKMS)}
Index: src/usr.sbin/sysinst/arch/i386/msg.md.es
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.es:1.1.4.1 src/usr.sbin/sysinst/arch/i386/msg.md.es:1.1.4.2
--- src/usr.sbin/sysinst/arch/i386/msg.md.es:1.1.4.1 Thu Dec 4 19:18:09 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.es Wed Mar 18 03:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.es,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
+/* $NetBSD: msg.md.es,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -162,4 +162,3 @@ message updatembr
Record a la ultima versi�n del c�digo de arranque de NetBSD?}
message set_kernel_1 {N�cleo (GENERIC)}
-message set_kernel_2 {Núcleo (DRMKMS)}
Index: src/usr.sbin/sysinst/arch/i386/msg.md.fr
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.fr:1.1.4.1 src/usr.sbin/sysinst/arch/i386/msg.md.fr:1.1.4.2
--- src/usr.sbin/sysinst/arch/i386/msg.md.fr:1.1.4.1 Thu Dec 4 19:18:09 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.fr Wed Mar 18 03:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.fr,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
+/* $NetBSD: msg.md.fr,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -157,4 +157,3 @@ message updatembr
avec la derni�re version du code d'amor�age de NetBSD ?}
message set_kernel_1 {Kernel (GENERIC)}
-message set_kernel_2 {Kernel (DRMKMS)}
Index: src/usr.sbin/sysinst/arch/i386/msg.md.pl
diff -u src/usr.sbin/sysinst/arch/i386/msg.md.pl:1.1.4.1 src/usr.sbin/sysinst/arch/i386/msg.md.pl:1.1.4.2
--- src/usr.sbin/sysinst/arch/i386/msg.md.pl:1.1.4.1 Thu Dec 4 19:18:09 2014
+++ src/usr.sbin/sysinst/arch/i386/msg.md.pl Wed Mar 18 03:57:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.pl,v 1.1.4.1 2014/12/04 19:18:09 snj Exp $ */
+/* $NetBSD: msg.md.pl,v 1.1.4.2 2015/03/18 03:57:16 snj Exp $ */
/* Based on english version: */
/* NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp */
@@ -156,4 +156,3 @@ message updatembr
kodu rozruchowego NetBSD?}
message set_kernel_1 {Kernel (GENERIC)}
-message set_kernel_2 {Kernel (DRMKMS)}
