[src/uebayasi-xip]: src/sys/arch xmd(4) uses a conflicting symbol "md_root_im...

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

details:   https://anonhg.NetBSD.org/src/rev/b2ae14692d44
branches:  uebayasi-xip
changeset: 751821:b2ae14692d44
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Oct 30 05:02:28 2010 +0000

description:
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.

diffstat:

 sys/arch/amd64/conf/XIP |  3 ++-
 sys/arch/i386/conf/XIP  |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 651b23effa49 -r b2ae14692d44 sys/arch/amd64/conf/XIP
--- a/sys/arch/amd64/conf/XIP   Thu Oct 28 03:27:55 2010 +0000
+++ b/sys/arch/amd64/conf/XIP   Sat Oct 30 05:02:28 2010 +0000
@@ -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
diff -r 651b23effa49 -r b2ae14692d44 sys/arch/i386/conf/XIP
--- a/sys/arch/i386/conf/XIP    Thu Oct 28 03:27:55 2010 +0000
+++ b/sys/arch/i386/conf/XIP    Sat Oct 30 05:02:28 2010 +0000
@@ -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