Setting tag linux-2.6-27-38
[linux-2.6.git] / linux-2.6-560-mmconf.patch
1 diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/arch/x86/pci/common.c linux-2.6.27.10-vs2.3.x-P560/arch/x86/pci/common.c
2 --- linux-2.6.27.10-vs2.3.x-P/arch/x86/pci/common.c     2008-10-13 14:51:59.000000000 +0200
3 +++ linux-2.6.27.10-vs2.3.x-P560/arch/x86/pci/common.c  2009-01-15 00:02:44.000000000 +0100
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  unsigned int pci_early_dump_regs;
13  static int pci_bf_sort;
14 @@ -477,6 +476,10 @@ char * __devinit  pcibios_setup(char *st
15                 pci_probe |= PCI_CHECK_ENABLE_AMD_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();