backport acx100 2.6.24 fixes from SVN

[openwrt.git] / target / linux / adm5120 / patches-2.6.23 / 202-pci_disable_common_quirks.patch

diff --git a/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch
index c051abc..4d3cc59 100644 (file)
--- a/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch
+++ b/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23/drivers/pci/Kconfig
-==================================================================
---- linux-2.6.23.orig/drivers/pci/Kconfig      2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/pci/Kconfig   2007-10-13 14:21:03.000000000 +0200
-@@ -31,6 +31,12 @@
+Index: linux-2.6.23.14/drivers/pci/Kconfig
+===================================================================
+--- linux-2.6.23.14.orig/drivers/pci/Kconfig
++++ linux-2.6.23.14/drivers/pci/Kconfig
+@@ -31,6 +31,12 @@ config PCI_DEBUG
  
          When in doubt, say N.
  
@@ -15,10 +15,10 @@ Index: linux-2.6.23/drivers/pci/Kconfig
  config HT_IRQ
        bool "Interrupts on hypertransport devices"
        default y
-Index: linux-2.6.23/drivers/pci/quirks.c
-==================================================================
---- linux-2.6.23.orig/drivers/pci/quirks.c     2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/drivers/pci/quirks.c  2007-10-13 14:46:41.000000000 +0200
+Index: linux-2.6.23.14/drivers/pci/quirks.c
+===================================================================
+--- linux-2.6.23.14.orig/drivers/pci/quirks.c
++++ linux-2.6.23.14/drivers/pci/quirks.c
 @@ -23,6 +23,7 @@
  #include <linux/acpi.h>
  #include "pci.h"
@@ -27,7 +27,7 @@ Index: linux-2.6.23/drivers/pci/quirks.c
  /* The Mellanox Tavor device gives false positive parity errors
   * Mark this device with a broken_parity_status, to allow
   * PCI scanning code to "skip" this now blacklisted device.
-@@ -1510,6 +1511,7 @@
+@@ -1510,6 +1511,7 @@ static void __devinit fixup_rev1_53c810(
        }
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@@ -35,7 +35,7 @@ Index: linux-2.6.23/drivers/pci/quirks.c
  
  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
  {
-@@ -1573,6 +1575,7 @@
+@@ -1573,6 +1575,7 @@ void pci_fixup_device(enum pci_fixup_pas
  }
  EXPORT_SYMBOL(pci_fixup_device);
  
@@ -43,7 +43,7 @@ Index: linux-2.6.23/drivers/pci/quirks.c
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
-@@ -1743,3 +1746,4 @@
+@@ -1743,3 +1746,4 @@ static void __devinit quirk_nvidia_ck804
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
                        quirk_nvidia_ck804_msi_ht_cap);
  #endif /* CONFIG_PCI_MSI */