diff options
Diffstat (limited to 'drivers/char/drm/sis_drv.h')
-rw-r--r-- | drivers/char/drm/sis_drv.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/drm/sis_drv.h b/drivers/char/drm/sis_drv.h index 70d4ede75fe8..5630df874353 100644 --- a/drivers/char/drm/sis_drv.h +++ b/drivers/char/drm/sis_drv.h | |||
@@ -46,6 +46,7 @@ enum sis_family { | |||
46 | 46 | ||
47 | #include "drm_sman.h" | 47 | #include "drm_sman.h" |
48 | 48 | ||
49 | |||
49 | #define SIS_BASE (dev_priv->mmio) | 50 | #define SIS_BASE (dev_priv->mmio) |
50 | #define SIS_READ(reg) DRM_READ32(SIS_BASE, reg); | 51 | #define SIS_READ(reg) DRM_READ32(SIS_BASE, reg); |
51 | #define SIS_WRITE(reg, val) DRM_WRITE32(SIS_BASE, reg, val); | 52 | #define SIS_WRITE(reg, val) DRM_WRITE32(SIS_BASE, reg, val); |
@@ -53,7 +54,7 @@ enum sis_family { | |||
53 | typedef struct drm_sis_private { | 54 | typedef struct drm_sis_private { |
54 | drm_local_map_t *mmio; | 55 | drm_local_map_t *mmio; |
55 | unsigned int idle_fault; | 56 | unsigned int idle_fault; |
56 | drm_sman_t sman; | 57 | struct drm_sman sman; |
57 | unsigned int chipset; | 58 | unsigned int chipset; |
58 | int vram_initialized; | 59 | int vram_initialized; |
59 | int agp_initialized; | 60 | int agp_initialized; |
@@ -61,9 +62,9 @@ typedef struct drm_sis_private { | |||
61 | unsigned long agp_offset; | 62 | unsigned long agp_offset; |
62 | } drm_sis_private_t; | 63 | } drm_sis_private_t; |
63 | 64 | ||
64 | extern int sis_idle(drm_device_t *dev); | 65 | extern int sis_idle(struct drm_device *dev); |
65 | extern void sis_reclaim_buffers_locked(drm_device_t *dev, struct file *filp); | 66 | extern void sis_reclaim_buffers_locked(struct drm_device *dev, struct file *filp); |
66 | extern void sis_lastclose(drm_device_t *dev); | 67 | extern void sis_lastclose(struct drm_device *dev); |
67 | 68 | ||
68 | extern drm_ioctl_desc_t sis_ioctls[]; | 69 | extern drm_ioctl_desc_t sis_ioctls[]; |
69 | extern int sis_max_ioctl; | 70 | extern int sis_max_ioctl; |