Sat Oct 30 05:02:28 2010 UTC ()

xmd(4) uses a conflicting symbol "md_root_image" with md(4).
Exclude md(4) where xmd(4) is used.

XXX In the long run mdsetimage(8) must die.


(uebayasi)

diff -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/conf/XIP
diff -r1.1.2.1 -r1.1.2.2 src/sys/arch/i386/conf/XIP

--- src/sys/arch/amd64/conf/Attic/XIP 2010/08/27 09:41:51	1.1.2.1

+++ src/sys/arch/amd64/conf/Attic/XIP 2010/10/30 05:02:28	1.1.2.2

@@ -1,8 +1,9 @@
-#	$NetBSD: XIP,v 1.1.2.1 2010/08/27 09:41:51 uebayasi Exp $
+#	$NetBSD: XIP,v 1.1.2.2 2010/10/30 05:02:28 uebayasi Exp $
 
 include "arch/amd64/conf/GENERIC"
 
 options 	XIP
 
+no pseudo-device md
 pseudo-device	xmd		1	# XIP memory disk device (ramdisk)
 options 	XMD_ROOT_SIZE=10240	# 5MB

--- src/sys/arch/i386/conf/Attic/XIP 2010/08/20 07:04:38	1.1.2.1

+++ src/sys/arch/i386/conf/Attic/XIP 2010/10/30 05:02:28	1.1.2.2

@@ -1,9 +1,10 @@
-#	$NetBSD: XIP,v 1.1.2.1 2010/08/20 07:04:38 uebayasi Exp $
+#	$NetBSD: XIP,v 1.1.2.2 2010/10/30 05:02:28 uebayasi Exp $
 
 include "arch/i386/conf/GENERIC"
 
 file-system 	FFS		# UFS
 options 	XIP
 
+no pseudo-device md
 pseudo-device	xmd		1	# XIP memory disk device (ramdisk)
 options 	XMD_ROOT_SIZE=10240	# 5MB