diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /drivers/pci | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/Makefile | 22 | ||||
| -rw-r--r-- | drivers/pci/pci.ids | 2 | ||||
| -rw-r--r-- | drivers/pci/quirks.c | 14 |
3 files changed, 27 insertions, 11 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index c2e6ebdf9..280617193 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -9,22 +9,22 @@ # parent makefile. # -L_TARGET := pci.a +O_TARGET := driver.o -# Nasty trick as we need to link files with no references from the outside. -O_TARGET := pci_core.o -L_OBJS := pci_core.o -O_OBJS := quirks.o -OX_OBJS := pci.o +export-objs := pci.o -ifdef CONFIG_PROC_FS -O_OBJS += proc.o -endif +obj-$(CONFIG_PCI) += pci.o quirks.o compat.o names.o setup-res.o +obj-$(CONFIG_PROC_FS) += proc.o -L_OBJS += compat.o names.o setup-res.o setup-bus.o setup-irq.o +# +# Some architectures use the generic PCI setup functions +# +obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o +obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o +obj-$(CONFIG_SGI_IP27) += setup-irq.o ifndef CONFIG_X86 -L_OBJS += syscall.o +obj-y += syscall.o endif include $(TOPDIR)/Rules.make diff --git a/drivers/pci/pci.ids b/drivers/pci/pci.ids index df9937fd2..84c0e0364 100644 --- a/drivers/pci/pci.ids +++ b/drivers/pci/pci.ids @@ -4598,6 +4598,8 @@ 250f 82820 820 (Camino) Chipset PCI to AGP Bridge 2520 82805AA MTH Memory Translator Hub 2521 82804AA MRH-S Memory Repeater Hub for SDRAM + 2530 82850 850 (Tehama) Chipset Host Bridge (MCH) + 2532 82850 850 (Tehama) Chipset AGP Bridge 5200 EtherExpress PRO/100 5201 EtherExpress PRO/100 8086 0001 EtherExpress PRO/100 Server Ethernet Adapter diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 9913c1998..6ee9208e9 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -85,6 +85,19 @@ static void __init quirk_triton(struct pci_dev *dev) } /* + * VIA Apollo VP3 needs ETBF on BT848/878 + */ + +static void __init quirk_viaetbf(struct pci_dev *dev) +{ + if((pci_pci_problems&PCIPCI_VIAETBF)==0) + { + printk(KERN_INFO "Limiting direct PCI/PCI transfers.\n"); + pci_pci_problems|=PCIPCI_VIAETBF; + } +} + +/* * Natoma has some interesting boundary conditions with Zoran stuff * at least */ @@ -262,6 +275,7 @@ static struct pci_fixup pci_fixups[] __initdata = { { PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2, quirk_natoma }, { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, quirk_nopcipci }, { PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496, quirk_nopcipci }, + { PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_viaetbf }, { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C597_0, quirk_vt82c598_id }, { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3, quirk_vt82c586_acpi }, { PCI_FIXUP_HEADER, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4, quirk_vt82c686_acpi }, |