diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-01 03:16:17 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-01 03:16:17 +0000 |
| commit | d8d9b8f76f22b7a16a83e261e64f89ee611f49df (patch) | |
| tree | 3067bc130b80d52808e6390c9fc7fc087ec1e33c /drivers/pci/pci.c | |
| parent | 19c9bba94152148523ba0f7ef7cffe3d45656b11 (diff) | |
Initial revision
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8baf90212..2aae7a2db 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -13,6 +13,7 @@ #include <linux/bios32.h> #include <linux/pci.h> #include <linux/string.h> +#include <linux/init.h> #include <asm/page.h> @@ -149,6 +150,7 @@ struct pci_dev_info dev_info[] = { DEVICE( CMD, CMD_646, "646"), DEVICE( VISION, VISION_QD8500, "QD-8500"), DEVICE( VISION, VISION_QD8580, "QD-8580"), + DEVICE( BROOKTREE, BT848, "Brooktree 848"), DEVICE( SIERRA, SIERRA_STB, "STB Horizon 64"), DEVICE( ACC, ACC_2056, "2056"), DEVICE( WINBOND, WINBOND_83769, "W83769F"), @@ -263,6 +265,7 @@ struct pci_dev_info dev_info[] = { DEVICE( INTEL, INTEL_82437VX, "82437VX Triton II"), DEVICE( INTEL, INTEL_82371AB, "82371AB 430TX PIIX4"), DEVICE( INTEL, INTEL_P6, "Orion P6"), + DEVICE( INTEL, INTEL_P6_2, "82450GX Orion P6"), DEVICE( KTI, KTI_ET32P2, "ET32P2"), DEVICE( ADAPTEC, ADAPTEC_7850, "AIC-7850"), DEVICE( ADAPTEC, ADAPTEC_7855, "AIC-7855"), @@ -517,6 +520,7 @@ const char *pci_strvendor(unsigned int vendor) case PCI_VENDOR_ID_OLICOM: return "Olicom"; case PCI_VENDOR_ID_CMD: return "CMD"; case PCI_VENDOR_ID_VISION: return "Vision"; + case PCI_VENDOR_ID_BROOKTREE: return "Brooktree"; case PCI_VENDOR_ID_SIERRA: return "Sierra"; case PCI_VENDOR_ID_ACC: return "ACC MICROELECTRONICS"; case PCI_VENDOR_ID_WINBOND: return "Winbond"; @@ -576,8 +580,8 @@ const char *pci_strdev(unsigned int vendor, unsigned int device) /* * Turn on/off PCI bridge optimization. This should allow benchmarking. */ -static void burst_bridge(unsigned char bus, unsigned char devfn, - unsigned char pos, int turn_on) +__initfunc(static void burst_bridge(unsigned char bus, unsigned char devfn, + unsigned char pos, int turn_on)) { #ifdef CONFIG_PCI_OPTIMIZE struct bridge_mapping_type *bmap; @@ -791,7 +795,7 @@ int get_pci_list(char *buf) * pci_malloc() returns initialized memory of size SIZE. Can be * used only while pci_init() is active. */ -static void *pci_malloc(long size, unsigned long *mem_startp) +__initfunc(static void *pci_malloc(long size, unsigned long *mem_startp)) { void *mem; @@ -805,7 +809,7 @@ static void *pci_malloc(long size, unsigned long *mem_startp) } -static unsigned int scan_bus(struct pci_bus *bus, unsigned long *mem_startp) +__initfunc(static unsigned int scan_bus(struct pci_bus *bus, unsigned long *mem_startp)) { unsigned int devfn, l, max; unsigned char cmd, tmp, hdr_type = 0; @@ -980,12 +984,12 @@ static unsigned int scan_bus(struct pci_bus *bus, unsigned long *mem_startp) } -unsigned long pci_init (unsigned long mem_start, unsigned long mem_end) +__initfunc(unsigned long pci_init (unsigned long mem_start, unsigned long mem_end)) { mem_start = pcibios_init(mem_start, mem_end); if (!pcibios_present()) { - printk("pci_init: no BIOS32 detected\n"); + printk("pci_init: no PCI BIOS detected\n"); return mem_start; } |