2.6.0-test3-bk4 compilation failures

If my .config has ACPI enabled but CONFIG_X86_UP_IOAPIC not set then the compilation fails:

arch/i386/kernel/mpparse.c: In function `mp_config_ioapic_for_sci':
arch/i386/kernel/mpparse.c:1065: warning: implicit declaration of function mp_find_ioapic' arch/i386/kernel/mpparse.c:1067: error: mp_ioapic_routing' undeclared (first use in this function) arch/i386/kernel/mpparse.c:1067: error: (Each undeclared identifier is reported only once arch/i386/kernel/mpparse.c:1067: error: for each function it appears in.) arch/i386/kernel/mpparse.c:1069: warning: implicit declaration of function io_apic_set_pci_routing' arch/i386/kernel/mpparse.c: In function mp_parse_prt':
arch/i386/kernel/mpparse.c:1113: error: `mp_ioapic_routing' undeclared (first use in this function)

If I then set both CONFIG_X86_UP_IOAPIC and CONFIG_X86_IO_APIC to 'y' the compilation fails:

drivers/ide/pci/amd74xx.c: In function `amd74xx_get_info':
drivers/ide/pci/amd74xx.c:107: error: structure has no member named name' drivers/ide/pci/amd74xx.c: In function init_chipset_amd74xx':
drivers/ide/pci/amd74xx.c:368: error: structure has no member named `name'

-- Grant