From 266bd056b2823143804649a1b96fc605ca7cb96c Mon Sep 17 00:00:00 2001
From: eeh <eeh@NetBSD.org>
Date: Wed, 13 Mar 2002 19:13:10 +0000
Subject: [PATCH] Adapt to the new, separate mainbus.

---
 sys/arch/powerpc/ibm4xx/dev/com_mainbus.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/sys/arch/powerpc/ibm4xx/dev/com_mainbus.c b/sys/arch/powerpc/ibm4xx/dev/com_mainbus.c
index 68a0f33e7ab0..a231af4f10c7 100644
--- a/sys/arch/powerpc/ibm4xx/dev/com_mainbus.c
+++ b/sys/arch/powerpc/ibm4xx/dev/com_mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com_mainbus.c,v 1.3 2002/03/08 01:36:34 simonb Exp $	*/
+/*	$NetBSD: com_mainbus.c,v 1.4 2002/03/13 19:13:10 eeh Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -38,6 +38,7 @@
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/tty.h>
+#include <sys/systm.h>
 
 #include <lib/libkern/libkern.h>
 
@@ -64,10 +65,10 @@ int comfound = 0;
 int
 com_mainbus_probe(struct device *parent, struct cfdata *cf, void *aux)
 {
-	union mainbus_attach_args *maa = aux;
+	struct mainbus_attach_args *maa = aux;
 
 	/* match only com devices */
-	if (strcmp(maa->mba_rmb.rmb_name, cf->cf_driver->cd_name) != 0)
+	if (strcmp(maa->mb_name, cf->cf_driver->cd_name) != 0)
 		return 0;
 
 	return (comfound < 2);
@@ -80,9 +81,9 @@ com_mainbus_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct com_mainbus_softc *msc = (void *)self;
 	struct com_softc *sc = &msc->sc_com;
-	union mainbus_attach_args *maa = aux;
-	int addr = maa->mba_rmb.rmb_addr;
-	int irq = maa->mba_rmb.rmb_irq;
+	struct mainbus_attach_args *maa = aux;
+	int addr = maa->mb_addr;
+	int irq = maa->mb_irq;
 	
 	sc->sc_iot = galaxy_make_bus_space_tag(0, 0);
 	sc->sc_iobase = sc->sc_ioh = addr;