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

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

details:   https://anonhg.NetBSD.org/src/rev/11c39d450a88
branches:  netbsd-6
changeset: 775446:11c39d450a88
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Nov 18 21:58:42 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #647):
        sys/arch/x68k/conf/GENERIC: revision 1.162
Now we get working netboot loader, so enable options NFS_BOOT_DHCP by default.

diffstat:

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

diffs (27 lines):

diff -r b33cb6e161ac -r 11c39d450a88 sys/arch/x68k/conf/GENERIC
--- a/sys/arch/x68k/conf/GENERIC        Sun Nov 18 21:56:36 2012 +0000
+++ b/sys/arch/x68k/conf/GENERIC        Sun Nov 18 21:58:42 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.159 2011/12/18 05:49:33 dholland Exp $
+# $NetBSD: GENERIC,v 1.159.2.1 2012/11/18 21:58:42 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.159 $"
+#ident                 "GENERIC-$Revision: 1.159.2.1 $"
 
 maxusers       8
 
@@ -93,7 +93,7 @@
 ## NFS boot options; not supported currently: needs nfsboot program
 #options       NFS_BOOT_BOOTPARAM
 #options       NFS_BOOT_BOOTP
-#options       NFS_BOOT_DHCP
+options        NFS_BOOT_DHCP
 
 #### Debugging options