From 9a711206543d95fce3362cc7f8d343c17ee4239c Mon Sep 17 00:00:00 2001
From: dsl <dsl@NetBSD.org>
Date: Sun, 15 Jul 2007 08:40:22 +0000
Subject: [PATCH] Default MEMORY_DISK_SERVER to 1 instead of using 'undefined'
 to mean 1.

---
 sys/conf/files | 4 ++--
 sys/dev/md.c   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index e2840493b004..d8c48780004f 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.850 2007/07/14 10:52:14 ad Exp $
+#	$NetBSD: files,v 1.851 2007/07/15 08:40:22 dsl Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -233,7 +233,7 @@ defflag	opt_kstack.h		KSTACK_CHECK_MAGIC
 #
 defflag	opt_md.h		MEMORY_DISK_HOOKS MEMORY_DISK_IS_ROOT
 				MEMORY_DISK_DYNAMIC
-defparam opt_md.h		MEMORY_DISK_SERVER MEMORY_DISK_ROOT_SIZE
+defparam opt_md.h		MEMORY_DISK_SERVER=1 MEMORY_DISK_ROOT_SIZE
 				MEMORY_RBFLAGS
 
 defflag opt_tftproot.h		TFTPROOT TFTPROOT_DEBUG
diff --git a/sys/dev/md.c b/sys/dev/md.c
index 5460540f9ebc..7177dfa89056 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.48 2007/03/04 06:01:42 christos Exp $	*/
+/*	$NetBSD: md.c,v 1.49 2007/07/15 08:40:22 dsl Exp $	*/
 
 /*
  * Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.48 2007/03/04 06:01:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.49 2007/07/15 08:40:22 dsl Exp $");
 
 #include "opt_md.h"
 
@@ -67,11 +67,11 @@ __KERNEL_RCSID(0, "$NetBSD: md.c,v 1.48 2007/03/04 06:01:42 christos Exp $");
 #include <dev/md.h>
 
 /*
- * By default, include the user-space functionality.
+ * The user-space functionality is included by default.
  * Use  `options MEMORY_DISK_SERVER=0' to turn it off.
  */
 #ifndef MEMORY_DISK_SERVER
-#define	MEMORY_DISK_SERVER 1
+#error MEMORY_DISK_SERVER should be defined by opt_md.h
 #endif	/* MEMORY_DISK_SERVER */
 
 /*