fix madwifi mode setting

[openwrt.git] / target / linux / adm5120 / patches / 202-pci_disable_common_quirks.patch

diff --git a/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch
index 52fa931..2514988 100644 (file)
--- a/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch
+++ b/target/linux/adm5120/patches/202-pci_disable_common_quirks.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/drivers/pci/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/drivers/pci/Kconfig
-+++ linux-2.6.24.7/drivers/pci/Kconfig
-@@ -42,6 +42,12 @@ config PCI_DEBUG
+--- a/drivers/pci/Kconfig
++++ b/drivers/pci/Kconfig
+@@ -42,6 +42,12 @@

  
          When in doubt, say N.
  
  
          When in doubt, say N.
  


@@ -15,19 +13,17 @@ Index: linux-2.6.24.7/drivers/pci/Kconfig
  config HT_IRQ
        bool "Interrupts on hypertransport devices"
        default y
  config HT_IRQ
        bool "Interrupts on hypertransport devices"
        default y

-Index: linux-2.6.24.7/drivers/pci/quirks.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/pci/quirks.c
-+++ linux-2.6.24.7/drivers/pci/quirks.c
-@@ -23,6 +23,7 @@
- #include <linux/acpi.h>
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -24,6 +24,7 @@
+ #include <linux/kallsyms.h>

  #include "pci.h"
  
 +#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.
  #include "pci.h"
  
 +#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.

-@@ -1480,6 +1481,7 @@ static void __devinit fixup_rev1_53c810(
+@@ -1495,6 +1496,7 @@

        }
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
        }
  }
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);


@@ -35,7 +31,7 @@ Index: linux-2.6.24.7/drivers/pci/quirks.c
  
  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
  {
  
  static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
  {

-@@ -1543,6 +1545,7 @@ void pci_fixup_device(enum pci_fixup_pas
+@@ -1562,6 +1564,7 @@

  }
  EXPORT_SYMBOL(pci_fixup_device);
  
  }
  EXPORT_SYMBOL(pci_fixup_device);
  


@@ -43,7 +39,7 @@ Index: linux-2.6.24.7/drivers/pci/quirks.c
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {
  /* Enable 1k I/O space granularity on the Intel P64H2 */
  static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
  {

-@@ -1756,3 +1759,4 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
+@@ -1875,3 +1878,4 @@

                        quirk_msi_intx_disable_bug);
  
  #endif /* CONFIG_PCI_MSI */
                        quirk_msi_intx_disable_bug);
  
  #endif /* CONFIG_PCI_MSI */