[src/netbsd-6]: src/sys/arch/amd64/conf Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/3cb1d54cbe04
branches:  netbsd-6
changeset: 776711:3cb1d54cbe04
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Sep 29 18:40:43 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1129):
        sys/arch/amd64/conf/GENERIC: revision 1.385
Enable options VND_COMPRESSION in amd64/GENERIC.

diffstat:

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

diffs (27 lines):

diff -r 9d45814f9fad -r 3cb1d54cbe04 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Mon Sep 29 18:39:02 2014 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Mon Sep 29 18:40:43 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.348.2.6 2012/08/15 15:32:59 sborrill Exp $
+# $NetBSD: GENERIC,v 1.348.2.7 2014/09/29 18:40:43 msaitoh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.348.2.6 $"
+#ident                 "GENERIC-$Revision: 1.348.2.7 $"
 
 maxusers       64              # estimated number of users
 
@@ -1175,7 +1175,7 @@
 options        MEMORY_DISK_DYNAMIC     # loaded via kernel module(7)
 
 pseudo-device  vnd                     # disk-like interface to files
-#options       VND_COMPRESSION         # compressed vnd(4)
+options        VND_COMPRESSION         # compressed vnd(4)
 
 # NPF
 #pseudo-device npf