Module Name: src Committed By: martin Date: Wed Apr 19 16:45:37 UTC 2023
Modified Files: src/sys/arch/luna68k/luna68k [netbsd-9]: mainbus.c Log Message: Backout accidental commit (branch/ticket mismatch) To generate a diff of this commit: cvs rdiff -u -r1.15.18.1 -r1.15.18.2 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.18.1 src/sys/arch/luna68k/luna68k/mainbus.c:1.15.18.2 --- src/sys/arch/luna68k/luna68k/mainbus.c:1.15.18.1 Wed Apr 19 16:43:23 2023 +++ src/sys/arch/luna68k/luna68k/mainbus.c Wed Apr 19 16:45:37 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.15.18.1 2023/04/19 16:43:23 martin Exp $ */ +/* $NetBSD: mainbus.c,v 1.15.18.2 2023/04/19 16:45:37 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.18.1 2023/04/19 16:43:23 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.15.18.2 2023/04/19 16:45:37 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 */ - { "xpbus", 0x71000000, -1 }, /* HD647180XP */ + { "xp", 0x71000000, 1 }, /* HD647180XP */ { "fb", 0xc1100000, -1 }, /* BrookTree RAMDAC */ { "spc", 0xe1000000, 2 }, /* internal MB89352 */ { "spc", 0xe1000040, 2 }, /* external MB89352 */