1 files changed, 17 insertions, 2 deletions

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 07d5223442bf..2d71bbc411d2 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -29,12 +29,14 @@ struct pci_raw_ops *raw_pci_ops;
 
 static int pci_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *value)
 {
-        return raw_pci_ops->read(0, bus->number, devfn, where, size, value);
+        return raw_pci_ops->read(pci_domain_nr(bus), bus->number,
+                                 devfn, where, size, value);
 }
 
 static int pci_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 value)
 {
-        return raw_pci_ops->write(0, bus->number, devfn, where, size, value);
+        return raw_pci_ops->write(pci_domain_nr(bus), bus->number,
+                                  devfn, where, size, value);
 }
 
 struct pci_ops pci_root_ops = {
@@ -287,6 +289,16 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL685c G1"),
                 },
         },
+#ifdef __i386__
+        {
+                .callback = assign_all_busses,
+                .ident = "Compaq EVO N800c",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "EVO N800c"),
+                },
+        },
+#endif
         {}
 };
 
@@ -426,6 +438,9 @@ char * __devinit  pcibios_setup(char *str)
         } else if (!strcmp(str, "assign-busses")) {
                 pci_probe |= PCI_ASSIGN_ALL_BUSSES;
                 return NULL;
+        } else if (!strcmp(str, "use_crs")) {
+                pci_probe |= PCI_USE__CRS;
+                return NULL;
         } else if (!strcmp(str, "routeirq")) {
                 pci_routeirq = 1;
                 return NULL;