aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/sn/kernel/io_common.c
diff options
context:
space:
mode:
authorJohn Keller <jpk@sgi.com>2006-10-04 16:49:52 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-01 14:36:58 -0800
commita2302c68d923537436b1114aa207787c1a31bd50 (patch)
treebf0407f2176a32ec79d2b7ab82e1fc9e54308fd2 /arch/ia64/sn/kernel/io_common.c
parent9f581f162e2b304be25dee49bf3945d4ed65dfb6 (diff)
Altix: Initial ACPI support - ROM shadowing.
Support a shadowed ROM when running with an ACPI capable PROM. Define a new dev.resource flag IORESOURCE_ROM_BIOS_COPY to describe the case of a BIOS shadowed ROM, which can then be used to avoid pci_map_rom() making an unneeded call to pci_enable_rom(). Signed-off-by: John Keller <jpk@sgi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/ia64/sn/kernel/io_common.c')
-rw-r--r--arch/ia64/sn/kernel/io_common.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 12531de6754..d4dd8f4b6b8 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -286,9 +286,10 @@ void sn_pci_fixup_slot(struct pci_dev *dev)
list_add_tail(&pcidev_info->pdi_list,
&(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
- if (!SN_ACPI_BASE_SUPPORT())
+ if (SN_ACPI_BASE_SUPPORT())
+ sn_acpi_slot_fixup(dev, pcidev_info);
+ else
sn_more_slot_fixup(dev, pcidev_info);
-
/*
* Using the PROMs values for the PCI host bus, get the Linux
* PCI host_pci_dev struct and set up host bus linkages