Setting tag linux-2.6-22-50
[linux-2.6.git] / linux-2.6-560-mmconf.patch
1 diff -Nurp linux-2.6.22-550/arch/i386/pci/common.c linux-2.6.22-560/arch/i386/pci/common.c
2 --- linux-2.6.22-550/arch/i386/pci/common.c     2007-07-21 17:58:15.000000000 -0400
3 +++ linux-2.6.22-560/arch/i386/pci/common.c     2007-12-04 14:47:24.000000000 -0500
4 @@ -17,8 +17,7 @@
5  
6  #include "pci.h"
7  
8 -unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
9 -                               PCI_PROBE_MMCONF;
10 +unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
11  
12  static int pci_bf_sort;
13  int pci_routeirq;
14 @@ -388,6 +387,10 @@ char * __devinit  pcibios_setup(char *st
15                 pci_probe &= ~PCI_PROBE_MMCONF;
16                 return NULL;
17         }
18 +       else if (!strcmp(str, "mmconf")) {
19 +               pci_probe |= PCI_PROBE_MMCONF;
20 +               return NULL;
21 +       }
22  #endif
23         else if (!strcmp(str, "noacpi")) {
24                 acpi_noirq_set();