[src/netbsd-10]: src/sys/arch/luna68k/luna68k Pull up following revision(s) (...

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

details:   https://anonhg.NetBSD.org/src/rev/7e46dc37c97c
branches:  netbsd-10
changeset: 374337:7e46dc37c97c
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 19 16:40:19 2023 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #142):

        sys/arch/luna68k/luna68k/mainbus.c: revision 1.20

Fix device name for xpbus at mainbus for LUNA-II, missed on psgpam merge.

Fortunately harmless because xpbus_match() doesn't check ma_name in
mainbus_attach_args.

diffstat:

 sys/arch/luna68k/luna68k/mainbus.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f8dfab319add -r 7e46dc37c97c sys/arch/luna68k/luna68k/mainbus.c
--- a/sys/arch/luna68k/luna68k/mainbus.c        Wed Apr 19 16:24:51 2023 +0000
+++ b/sys/arch/luna68k/luna68k/mainbus.c        Wed Apr 19 16:40:19 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.18 2022/06/10 21:42:24 tsutsui Exp $ */
+/* $NetBSD: mainbus.c,v 1.18.4.1 2023/04/19 16:40:19 martin Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2022/06/10 21:42:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18.4.1 2023/04/19 16:40:19 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,7 +55,7 @@ static const struct mainbus_attach_args 
        { "lcd",    0x4d000000, -1 },   /* Sharp LM16X212 LCD module */
        { "le",     0xf1000000, 3 },    /* Am7990 */
        { "sio",    0x51000000, 6 },    /* uPD7201A */
-       { "xp",     0x71000000, 1 },    /* HD647180XP */
+       { "xpbus",  0x71000000, -1 },   /* HD647180XP */
        { "fb",     0xc1100000, -1 },   /* BrookTree RAMDAC */
        { "spc",    0xe1000000, 2 },    /* internal MB89352 */
        { "spc",    0xe1000040, 2 },    /* external MB89352 */