diff options
| author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-05 08:50:54 +0000 |
|---|---|---|
| committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-05 08:50:54 +0000 |
| commit | b74489d910ba0c22c30fc3db6d9f1c316c7333a8 (patch) | |
| tree | 0c8716c5e67d2f8142dc9e18a5bac307c709c041 /target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch | |
| parent | 768e3f0496554d89a23b312eb2d50d9af5c2ce62 (diff) | |
linux/generic: refresh 2.6.36 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23237 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch index 0f4789a70..282ef6881 100644 --- a/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.36/030-pci_disable_common_quirks.patch @@ -15,15 +15,15 @@ default y --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -91,6 +91,7 @@ static void __devinit quirk_resource_ali +@@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_ } - DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_resource_alignment); + DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on); +#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS /* 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. -@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1923,7 +1924,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) { -@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -2596,6 +2599,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); #endif /* CONFIG_PCI_IOV */ |