Updating from the mainline PL kernel

[linux-2.6.git] / linux-2.6-560-mmconf.patch

diff --git a/linux-2.6-560-mmconf.patch b/linux-2.6-560-mmconf.patch
index eb7db27..e60bcdb 100644 (file)
--- a/linux-2.6-560-mmconf.patch
+++ b/linux-2.6-560-mmconf.patch
@@ -1,6 +1,6 @@
-diff -Nurp linux-2.6.22-550/arch/i386/pci/common.c linux-2.6.22-560/arch/i386/pci/common.c
---- linux-2.6.22-550/arch/i386/pci/common.c    2007-07-21 17:58:15.000000000 -0400
-+++ linux-2.6.22-560/arch/i386/pci/common.c    2007-12-04 14:47:24.000000000 -0500
+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
+--- linux-2.6.27.10-vs2.3.x-P/arch/x86/pci/common.c    2008-10-13 14:51:59.000000000 +0200
++++ linux-2.6.27.10-vs2.3.x-P560/arch/x86/pci/common.c 2009-01-15 00:02:44.000000000 +0100
 @@ -17,8 +17,7 @@
  
  #include "pci.h"
@@ -9,10 +9,10 @@ diff -Nurp linux-2.6.22-550/arch/i386/pci/common.c linux-2.6.22-560/arch/i386/pc
 -                              PCI_PROBE_MMCONF;
 +unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2;
  
+ unsigned int pci_early_dump_regs;
  static int pci_bf_sort;
- int pci_routeirq;
-@@ -388,6 +387,10 @@ char * __devinit  pcibios_setup(char *st
-               pci_probe &= ~PCI_PROBE_MMCONF;
+@@ -477,6 +476,10 @@ char * __devinit  pcibios_setup(char *st
+               pci_probe |= PCI_CHECK_ENABLE_AMD_MMCONF;
                return NULL;
        }
 +      else if (!strcmp(str, "mmconf")) {