On Tue, Jun 21, 2005 at 08:19:26AM +0000, Christopher SEKIYA wrote:
> Modified Files:
> 	src/sys/arch/i386/conf: CARDBUS GENERIC GENERIC.MPACPI GENERIC_LAPTOP
> 	    INSTALL_LAPTOP IOPENER LAMB NET4501 SWINGER VIRTUALPC files.i386
> 	src/sys/arch/i386/i386: mainbus.c rbus_machdep.c
> 	src/sys/arch/i386/pci: pci_intr_fixup.c pcibios.c
> 	src/sys/dev/acpi: acpi.c files.acpi
> 
> Log Message:
> Rework the configuration scheme for PCI fixups:
> 
> * bus enumeration fixups are not PCIBIOS-specific, interrupt fixups are done
>   by both PCIBIOS and ACPI.  The redundancy is very redundant.  Therefore,
>   rename PCIBIOS_*_FIXUP to PCI_*_FIXUP, use PCI_INTR_FIXUP in place of
>   ACPI_PCI_FIXUP, and change code refences to match.
> 
> * move the fixup defines from opt_pcibios.h to opt_pcifixup.h to reflect
>   the above.
> 
> * fix up the PCI bus numbering in mainbus_attach(), right after we detect the
>   configuration mode.  This probably renders the fixup in pcibios.c
>   redundant -- but it should be harmless.
> 
> These changes make cardbus work in ACPI-only machines, when PCI_BUS_FIXUP
> and PCI_INTR_FIXUP are defined.

Do we want backwards compatibility defines for the old option
names, or warnings when they are still mentioned in a kernel config?

Could you please document the new options in options(4)? The old
ones weren't documented :(

Thanks,
 Thomas