diff options
| -rw-r--r-- | target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch | 50 | ||||
| -rw-r--r-- | target/linux/adm5120/router_be/config-2.6.23 | 8 | ||||
| -rw-r--r-- | target/linux/adm5120/router_le/config-2.6.23 | 9 |
3 files changed, 52 insertions, 15 deletions
diff --git a/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch new file mode 100644 index 0000000000..c051abc8aa --- /dev/null +++ b/target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch @@ -0,0 +1,50 @@ +Index: linux-2.6.23/drivers/pci/Kconfig +================================================================== +--- linux-2.6.23.orig/drivers/pci/Kconfig 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/drivers/pci/Kconfig 2007-10-13 14:21:03.000000000 +0200 +@@ -31,6 +31,12 @@ + + When in doubt, say N. + ++config PCI_DISABLE_COMMON_QUIRKS ++ bool "PCI disable common quirks" ++ depends on PCI ++ help ++ If you don't know what to do here, say N. ++ + config HT_IRQ + bool "Interrupts on hypertransport devices" + default y +Index: linux-2.6.23/drivers/pci/quirks.c +================================================================== +--- linux-2.6.23.orig/drivers/pci/quirks.c 2007-10-09 22:31:38.000000000 +0200 ++++ linux-2.6.23/drivers/pci/quirks.c 2007-10-13 14:46:41.000000000 +0200 +@@ -23,6 +23,7 @@ + #include <linux/acpi.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. +@@ -1510,6 +1511,7 @@ + } + } + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810); ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ + + static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end) + { +@@ -1573,6 +1575,7 @@ + } + EXPORT_SYMBOL(pci_fixup_device); + ++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS + /* Enable 1k I/O space granularity on the Intel P64H2 */ + static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev) + { +@@ -1743,3 +1746,4 @@ + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE, + quirk_nvidia_ck804_msi_ht_cap); + #endif /* CONFIG_PCI_MSI */ ++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */ diff --git a/target/linux/adm5120/router_be/config-2.6.23 b/target/linux/adm5120/router_be/config-2.6.23 index 09c23bc22d..7cf0fb4e72 100644 --- a/target/linux/adm5120/router_be/config-2.6.23 +++ b/target/linux/adm5120/router_be/config-2.6.23 @@ -162,14 +162,10 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_SLRAM is not set CONFIG_MTD_TRXSPLIT=y CONFIG_NETDEV_1000=y -CONFIG_NET_ACT_POLICE=y CONFIG_NET_KEY=y # CONFIG_NET_PCI is not set # CONFIG_NET_PKTGEN is not set -CONFIG_NET_SCH_FIFO=y # CONFIG_NET_VENDOR_3COM is not set -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_GRE=m # CONFIG_NO_IOPORT is not set # CONFIG_PAGE_SIZE_16KB is not set CONFIG_PAGE_SIZE_4KB=y @@ -178,16 +174,15 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PARTITION_ADVANCED is not set # CONFIG_PCIPCWATCHDOG is not set CONFIG_PCI_ADM5120=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set # CONFIG_RTC is not set -# CONFIG_RTL8187 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_SCSI_WAIT_SCAN=m -# CONFIG_SENSORS_ABITUGURU3 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SERIAL_8250 is not set # CONFIG_SERIAL_ADM5120 is not set @@ -230,7 +225,6 @@ CONFIG_TMPFS_POSIX_ACL=y # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y -# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_USBPCWATCHDOG is not set # CONFIG_USB_ACM is not set CONFIG_USB_ADM5120_HCD=m diff --git a/target/linux/adm5120/router_le/config-2.6.23 b/target/linux/adm5120/router_le/config-2.6.23 index 163d669880..a1bee45827 100644 --- a/target/linux/adm5120/router_le/config-2.6.23 +++ b/target/linux/adm5120/router_le/config-2.6.23 @@ -171,16 +171,11 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_ROM is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_TRXSPLIT=y -# CONFIG_NETDEV_1000 is not set # CONFIG_NETFILTER_XT_TARGET_TARPIT is not set -CONFIG_NET_ACT_POLICE=y CONFIG_NET_KEY=y # CONFIG_NET_PCI is not set # CONFIG_NET_PKTGEN is not set -CONFIG_NET_SCH_FIFO=y # CONFIG_NET_VENDOR_3COM is not set -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_GRE=m # CONFIG_NO_IOPORT is not set # CONFIG_PAGE_SIZE_16KB is not set CONFIG_PAGE_SIZE_4KB=y @@ -189,16 +184,15 @@ CONFIG_PAGE_SIZE_4KB=y # CONFIG_PARTITION_ADVANCED is not set # CONFIG_PCIPCWATCHDOG is not set CONFIG_PCI_ADM5120=y +CONFIG_PCI_DISABLE_COMMON_QUIRKS=y # CONFIG_PMC_MSP is not set # CONFIG_PMC_YOSEMITE is not set # CONFIG_PNX8550_JBS is not set # CONFIG_PNX8550_STB810 is not set # CONFIG_RTC is not set -# CONFIG_RTL8187 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_SCSI_WAIT_SCAN=m -# CONFIG_SENSORS_ABITUGURU3 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SERIAL_8250 is not set # CONFIG_SERIAL_ADM5120 is not set @@ -240,7 +234,6 @@ CONFIG_TMPFS_POSIX_ACL=y # CONFIG_TOSHIBA_RBTX4927 is not set # CONFIG_TOSHIBA_RBTX4938 is not set CONFIG_TRAD_SIGNALS=y -# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_USBPCWATCHDOG is not set # CONFIG_USB_ACM is not set CONFIG_USB_ADM5120_HCD=m |