diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-04-26 04:53:49 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-04-26 04:53:49 +0000 |
| commit | 3e630d87e7ea65ebc52b53783c2c19c73b523c0b (patch) | |
| tree | d28d5e1da284a0466c9bf7417fd2a5a3dc53e3a5 /target/linux/adm5120 | |
| parent | 75b0fe8dbe0b1ee7a6c01787c38ed856c610ed23 (diff) | |
| download | upstream-3e630d87e7ea65ebc52b53783c2c19c73b523c0b.tar.gz upstream-3e630d87e7ea65ebc52b53783c2c19c73b523c0b.tar.bz2 upstream-3e630d87e7ea65ebc52b53783c2c19c73b523c0b.zip | |
refresh 2.6.28 patches
SVN-Revision: 15417
Diffstat (limited to 'target/linux/adm5120')
| -rw-r--r-- | target/linux/adm5120/patches-2.6.28/007-adm5120_pci.patch | 2 | ||||
| -rw-r--r-- | target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch | 6 |
2 files changed, 4 insertions, 4 deletions
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 */ |