Geoff Wing wrote:
> Garrett D'Amore <gdamore@netbsd.org> typed:
> : Module Name:	src
> : Committed By:	gdamore
> : Date:		Thu Jul 13 22:56:02 UTC 2006
> :
> : Modified Files:
> [...]
> : 	src/sys/dev/acpi: com_acpi.c
> [...]
> : cvs rdiff -r1.18 -r1.19 src/sys/dev/acpi/com_acpi.c
>
> Did sc_iot change to sc_regs.cr_iot or to something else?
>   

Yes.  Did the merge bust this?  (Looks like it did.  Doh!)  Sorry about
that.

    -- Garrett
> Index: sys/dev/acpi/com_acpi.c
> ===================================================================
> RCS file: /cvsroot/src/sys/dev/acpi/com_acpi.c,v
> retrieving revision 1.19
> diff -u -r1.19 com_acpi.c
> --- sys/dev/acpi/com_acpi.c	13 Jul 2006 22:56:02 -0000	1.19
> +++ sys/dev/acpi/com_acpi.c	14 Jul 2006 02:03:54 -0000
> @@ -129,7 +129,7 @@
>  	}
>  
>  	if (!com_is_console(aa->aa_iot, io->ar_base, &ioh)) {
> -		if (bus_space_map(sc->sc_iot, io->ar_base, io->ar_length,
> +		if (bus_space_map(sc->sc_regs.cr_iot, io->ar_base, io->ar_length,
>  		    0, &ioh)) {
>  			aprint_error("%s: can't map i/o space\n",
>  			    sc->sc_dev.dv_xname);
>
> Regards,
> Geoff
>   


-- 
Garrett D'Amore, Principal Software Engineer
Tadpole Computer / Computing Technologies Division,
General Dynamics C4 Systems
http://www.tadpolecomputer.com/
Phone: 951 325-2134  Fax: 951 325-2191