summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-26 04:53:49 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-26 04:53:49 +0000
commitf162c22105f329bdaecf8215c64e484e9c592c9d (patch)
treed00d99169bdd6336ee2279d9197355c81d6cb208 /target/linux
parent63151d3b34738ab38919029a9b89927a8982b0f6 (diff)
[adm5120] refresh 2.6.28 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15417 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/adm5120/patches-2.6.28/007-adm5120_pci.patch2
-rw-r--r--target/linux/adm5120/patches-2.6.28/202-pci_disable_common_quirks.patch6
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 */