diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2002-07-15 20:21:18 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-07-15 20:21:18 +0000 |
| commit | eef49a73b541d69be5da9b289deff36f5bb96ab0 (patch) | |
| tree | 0cc0fa5559d7bf87c25d277ef63d816d0090ccf4 /linux/sis_drv.c | |
| parent | deb296f395bb16ef7cf4bfe48f6e6c2cbacea0bc (diff) | |
Merge trunk into r200-branchr200-0-1-20020715
Diffstat (limited to 'linux/sis_drv.c')
| -rw-r--r-- | linux/sis_drv.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/linux/sis_drv.c b/linux/sis_drv.c index 2d9612f5..0c917bd4 100644 --- a/linux/sis_drv.c +++ b/linux/sis_drv.c @@ -31,31 +31,6 @@ #include "sis_drm.h" #include "sis_drv.h" -#define DRIVER_AUTHOR "SIS" -#define DRIVER_NAME "sis" -#define DRIVER_DESC "SIS 300/630/540" -#define DRIVER_DATE "20010503" -#define DRIVER_MAJOR 1 -#define DRIVER_MINOR 0 -#define DRIVER_PATCHLEVEL 0 - -#define DRIVER_IOCTLS \ - [DRM_IOCTL_NR(SIS_IOCTL_FB_ALLOC)] = { sis_fb_alloc, 1, 0 }, \ - [DRM_IOCTL_NR(SIS_IOCTL_FB_FREE)] = { sis_fb_free, 1, 0 }, \ - /* AGP Memory Management */ \ - [DRM_IOCTL_NR(SIS_IOCTL_AGP_INIT)] = { sisp_agp_init, 1, 0 }, \ - [DRM_IOCTL_NR(SIS_IOCTL_AGP_ALLOC)] = { sisp_agp_alloc, 1, 0 }, \ - [DRM_IOCTL_NR(SIS_IOCTL_AGP_FREE)] = { sisp_agp_free, 1, 0 } -#if 0 /* these don't appear to be defined */ - /* SIS Stereo */ - [DRM_IOCTL_NR(DRM_IOCTL_CONTROL)] = { sis_control, 1, 1 }, - [DRM_IOCTL_NR(SIS_IOCTL_FLIP)] = { sis_flip, 1, 1 }, - [DRM_IOCTL_NR(SIS_IOCTL_FLIP_INIT)] = { sis_flip_init, 1, 1 }, - [DRM_IOCTL_NR(SIS_IOCTL_FLIP_FINAL)] = { sis_flip_final, 1, 1 } -#endif - -#define __HAVE_COUNTERS 5 - #include "drm_auth.h" #include "drm_agpsupport.h" #include "drm_bufs.h" |