diff options
| author | anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-06-11 03:26:59 +0000 |
| commit | be5dc242b6a2d2549e38e77baf82adb7b33b042b (patch) | |
| tree | dc68be4b837d82c81a81bb2cec14ded275766e76 /sys/dev/drm/sis.h | |
| parent | da6e1707d47446b0f3de71fd5a924233a2168f65 (diff) | |
| download | FreeBSD-src-be5dc242b6a2d2549e38e77baf82adb7b33b042b.zip FreeBSD-src-be5dc242b6a2d2549e38e77baf82adb7b33b042b.tar.gz | |
Merge from DRI CVS as of 2004-05-26. Most of the meat is new PCI IDs and a new
packet for Radeon.
Diffstat (limited to 'sys/dev/drm/sis.h')
| -rw-r--r-- | sys/dev/drm/sis.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sys/dev/drm/sis.h b/sys/dev/drm/sis.h index 59a439f..0349818 100644 --- a/sys/dev/drm/sis.h +++ b/sys/dev/drm/sis.h @@ -34,11 +34,7 @@ * Name it sisdrv_##x as there's a conflict with sis_free/malloc in the kernel * that's used for fb devices */ -#ifdef __linux__ #define DRM(x) sisdrv_##x -#else -#define DRM(x) sis_##x -#endif /* General customization: */ @@ -63,13 +59,6 @@ [DRM_IOCTL_NR(DRM_IOCTL_SIS_AGP_FREE)] = { sis_ioctl_agp_free, 1, 0 }, \ [DRM_IOCTL_NR(DRM_IOCTL_SIS_FB_INIT)] = { sis_fb_init, 1, 1 } -#define DRIVER_PCI_IDS \ - {0x1039, 0x0300, 0, "SiS 300/305"}, \ - {0x1039, 0x5300, 0, "SiS 540"}, \ - {0x1039, 0x6300, 0, "SiS 630"}, \ - {0x1039, 0x7300, 0, "SiS 730"}, \ - {0, 0, 0, NULL} - #define __HAVE_COUNTERS 5 /* Buffer customization: |
