diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-11-22 04:30:42 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-11-22 04:30:42 +0000 |
| commit | 40b98550b7357a09aad4dfe870e508bc05f03705 (patch) | |
| tree | 5e68228e363fbe52114b64321c51fb67f24c6f3f /sys/dev/pci/drm/mga_drv.c | |
| parent | 90b38bc700cfe5e1cd65f0dfa5b74fdfa55eda43 (diff) | |
switch all of the drm drivers over to using the defines from pcidevs.
Furthermore, move the list of pcidevs from drm_pciids.h (in macros!), to
the array in the driver file. The strings are left in the array for now, but
will go in the next commit
Diffstat (limited to 'sys/dev/pci/drm/mga_drv.c')
| -rw-r--r-- | sys/dev/pci/drm/mga_drv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/mga_drv.c b/sys/dev/pci/drm/mga_drv.c index b93659f4ac8..2fa4b5b7a26 100644 --- a/sys/dev/pci/drm/mga_drv.c +++ b/sys/dev/pci/drm/mga_drv.c @@ -35,16 +35,18 @@ #include "drm.h" #include "mga_drm.h" #include "mga_drv.h" -#include "drm_pciids.h" int mgadrm_probe(struct device *, void *, void *); void mgadrm_attach(struct device *, struct device *, void *); int mga_driver_device_is_agp(struct drm_device * ); int mgadrm_ioctl(struct drm_device *, u_long, caddr_t, struct drm_file *); -/* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ static drm_pci_id_list_t mga_pciidlist[] = { - mga_PCI_IDS + {PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G200_PCI, MGA_CARD_TYPE_G200, "Matrox G200 (PCI)"}, + {PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G200_AGP, MGA_CARD_TYPE_G200, "Matrox G200 (AGP)"}, + {PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G400_AGP, MGA_CARD_TYPE_G400, "Matrox G400/G450 (AGP)"}, + {PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_MILL_II_G550_AGP, MGA_CARD_TYPE_G550, "Matrox G550 (AGP)"}, + {0, 0, 0, NULL} }; /** |