Re: CVS Update: 2.3

[Michel <mic...@ii...>]

Glenn Hisdal wrote:

> > Log message:
> >     some additions inspired by chrp_pci.c (thanks Geert :) - someone
> >     please test and post dmesg output
>=20
> dmesg output (only the lines that mentioned pci) :
>=20
> apus_pci: apus_setup_pci_ptrs: Phase5 B/CVisionPPC PCI bridge detected.
> APUS: BATs=3D1, BUS=3D67MHz, RAM=3D70ns, PCI bridge=3D1
> PCI: Probing PCI hardware
> apus_pcibios_fixup_bus: PCI mem resource requested

Cool, at least the new bus fixup function gets called...

BTW have you enabled the additional debugging code as suggested by Geert?


> apus_pci.c line 179 iirc :
>=20
> <<<<<<< apus_pci.c
>=20
>       =3D=3D=3D=3D=3D=3D=3D
>=20
> What the hell is this?
> CVS messed up ?

It's a merge conflict, you obviously had local modifications in that file=
. The
part between the '<'s and the '=3D's is what you had and the part between=
 the
'=3D's and the '>'s is the new revision in the repository (IIRC, may be v=
ice
versa). If you haven't added anything substantial, choose the latter. ;)


> PCI still doesn't work btw...

D'oh. Geert, help! :)

Thanks Glenn for testing.


--=20
Earthling Michel D=E4nzer (MrCooper)    \   Debian GNU/Linux (powerpc) de=
veloper
CS student, Free Software enthusiast   \        XFree86 and DRI project m=
ember