diff options
author | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-28 15:44:03 +0000 |
---|---|---|
committer | mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-28 15:44:03 +0000 |
commit | 4828b8d8e3fbec822445c8167f6b25691e19da66 (patch) | |
tree | 82abf4255bdb7ee2632da7a88ef332af75e76d5f /target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch | |
parent | d7975e7635f3d12207ef011cfb926a8927ab8818 (diff) |
Update 2.6.38 to 2.6.38.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26332 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch b/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch index e5d647d18..b81ab74dc 100644 --- a/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-2.6.38/030-pci_disable_common_quirks.patch @@ -1,5 +1,7 @@ ---- a/drivers/pci/Kconfig -+++ b/drivers/pci/Kconfig +Index: linux-2.6.38.1/drivers/pci/Kconfig +=================================================================== +--- linux-2.6.38.1.orig/drivers/pci/Kconfig 2011-03-23 21:04:47.000000000 +0100 ++++ linux-2.6.38.1/drivers/pci/Kconfig 2011-03-28 16:48:00.052118712 +0200 @@ -62,6 +62,12 @@ config XEN_PCIDEV_FE_DEBUG When in doubt, say N. @@ -13,8 +15,10 @@ config HT_IRQ bool "Interrupts on hypertransport devices" default y ---- a/drivers/pci/quirks.c -+++ b/drivers/pci/quirks.c +Index: linux-2.6.38.1/drivers/pci/quirks.c +=================================================================== +--- linux-2.6.38.1.orig/drivers/pci/quirks.c 2011-03-23 21:04:47.000000000 +0100 ++++ linux-2.6.38.1/drivers/pci/quirks.c 2011-03-28 16:48:13.130041612 +0200 @@ -104,6 +104,7 @@ static void __devinit quirk_mmio_always_ } DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, quirk_mmio_always_on); @@ -23,7 +27,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. -@@ -1944,7 +1945,9 @@ static void __devinit fixup_rev1_53c810( +@@ -1989,7 +1990,9 @@ static void __devinit fixup_rev1_53c810( } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); @@ -33,10 +37,10 @@ /* Enable 1k I/O space granularity on the Intel P64H2 */ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) { -@@ -2669,6 +2672,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov); +@@ -2662,6 +2665,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT + quirk_msi_intx_disable_bug); - #endif /* CONFIG_PCI_IOV */ + #endif /* CONFIG_PCI_MSI */ +#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ /* Allow manual resource allocation for PCI hotplug bridges |