Module Name: src
Committed By: martin
Date: Wed Apr 19 16:43:23 UTC 2023
Modified Files:
src/sys/arch/luna68k/luna68k [netbsd-9]: mainbus.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1627):
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.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.18.1 src/sys/arch/luna68k/luna68k/mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/luna68k/mainbus.c
diff -u src/sys/arch/luna68k/luna68k/mainbus.c:1.15 src/sys/arch/luna68k/luna68k/mainbus.c:1.15.18.1
--- src/sys/arch/luna68k/luna68k/mainbus.c:1.15 Thu Mar 9 14:05:59 2017
+++ src/sys/arch/luna68k/luna68k/mainbus.c Wed Apr 19 16:43:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.15 2017/03/09 14:05:59 tsutsui Exp $ */
+/* $NetBSD: mainbus.c,v 1.15.18.1 2023/04/19 16:43:23 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.15 2017/03/09 14:05:59 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.15.18.1 2023/04/19 16:43:23 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 */
