aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/sis_drv.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-11 20:21:05 -0400
committerDave Airlie <airlied@linux.ie>2007-07-11 20:21:05 -0400
commit9698b4dba42eb758ad98012c21e5fbdb372fe2d9 (patch)
tree5be810137553bd3885f34f89f2386aa32c3a9fa4 /drivers/char/drm/sis_drv.h
parent55910517af381eba4f978740e5e46e23eb269326 (diff)
drm: de-typedef sman
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/sis_drv.h')
-rw-r--r--drivers/char/drm/sis_drv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/drm/sis_drv.h b/drivers/char/drm/sis_drv.h
index 83c0ef264a15..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 {
53typedef struct drm_sis_private { 54typedef 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;