From: Gabor Juhos <juhosg@openwrt.org>
Date: Sun, 26 Apr 2009 04:53:49 +0000 (+0000)
Subject: refresh 2.6.28 patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3e630d87e7ea65ebc52b53783c2c19c73b523c0b;p=openwrt%2Fstaging%2Fjow.git

refresh 2.6.28 patches

SVN-Revision: 15417
---

diff --git a/target/linux/adm5120/patches-2.6.28/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.28/007-adm5120_pci.patch
index c3e0bea2d6..3393cfe049 100644
--- a/target/linux/adm5120/patches-2.6.28/007-adm5120_pci.patch
+++ b/target/linux/adm5120/patches-2.6.28/007-adm5120_pci.patch
@@ -7,7 +7,7 @@
 +obj-$(CONFIG_ADM5120)		+= pci-adm5120.o
 --- a/include/linux/pci_ids.h
 +++ b/include/linux/pci_ids.h
-@@ -1723,6 +1723,9 @@
+@@ -1729,6 +1729,9 @@
  #define PCI_VENDOR_ID_ESDGMBH		0x12fe
  #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
  
diff --git a/target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch
index 8e66c219b8..a8aa561d04 100644
--- a/target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch
+++ b/target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch
@@ -15,7 +15,7 @@
  	default y
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -33,6 +33,7 @@ int pcie_mch_quirk;
+@@ -34,6 +34,7 @@ int pcie_mch_quirk;
  EXPORT_SYMBOL(pcie_mch_quirk);
  
  #ifdef CONFIG_PCI_QUIRKS
@@ -23,7 +23,7 @@
  /* 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.
-@@ -1555,7 +1556,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1580,7 +1581,9 @@ static void __devinit fixup_rev1_53c810(
  	}
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
@@ -33,7 +33,7 @@
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
-@@ -1945,6 +1948,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+@@ -1972,6 +1975,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
  			quirk_msi_intx_disable_bug);
  
  #endif /* CONFIG_PCI_MSI */