Re: CVS Update: 2.3

[Glenn H. <gh...@c2...>]

On 09-Feb-01,  Michel wrote:

> Glenn Hisdal wrote:

>>> Log message:
>>>     some additions inspired by chrp_pci.c (thanks Geert :) - someone
>>>     please test and post dmesg output
>> 
>> dmesg output (only the lines that mentioned pci) :
>> 
>> apus_pci: apus_setup_pci_ptrs: Phase5 B/CVisionPPC PCI bridge detected.
>> APUS: BATs=1, BUS=67MHz, RAM=70ns, PCI bridge=1
>> 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?

yes.
At least I think so.


>> <<<<<<< apus_pci.c
>> 
>>       =======
>> 
>> What the hell is this?

> It's a merge conflict, you obviously had local modifications in that file.

oh, great. I had a blank line :-)


- glenn