diff options
author | Dave Airlie <airlied@linux.ie> | 2006-08-19 17:59:18 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-08-28 11:31:43 +1000 |
commit | 9b984b34e99f694e10251e15bc2ec1bc844dcca4 (patch) | |
tree | fe1ced27b1ed7bb36b609ad367ce0bfb48e58bb0 /shared-core/sis_drv.h | |
parent | 60ddaaf2e07b57997bcbaef0576005b52130bd24 (diff) |
drm: lots of small cleanups and whitespace issues fixed up
remove a mach64 warning, align a lot of things from linux kernel
Diffstat (limited to 'shared-core/sis_drv.h')
-rw-r--r-- | shared-core/sis_drv.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/shared-core/sis_drv.h b/shared-core/sis_drv.h index b739a483..d1cdc19c 100644 --- a/shared-core/sis_drv.h +++ b/shared-core/sis_drv.h @@ -40,8 +40,8 @@ #define DRIVER_PATCHLEVEL 1 enum sis_family { - SIS_OTHER = 0, - SIS_CHIP_315 = 1, + SIS_OTHER = 0, + SIS_CHIP_315 = 1, }; #if defined(__linux__) @@ -52,18 +52,18 @@ enum sis_family { #include "drm_sman.h" #define SIS_BASE (dev_priv->mmio) -#define SIS_READ(reg) DRM_READ32(SIS_BASE, reg); +#define SIS_READ(reg) DRM_READ32(SIS_BASE, reg); #define SIS_WRITE(reg, val) DRM_WRITE32(SIS_BASE, reg, val); typedef struct drm_sis_private { - drm_local_map_t *mmio; - unsigned idle_fault; - drm_sman_t sman; - unsigned long chipset; - int vram_initialized; - int agp_initialized; - unsigned long vram_offset; - unsigned long agp_offset; + drm_local_map_t *mmio; + unsigned idle_fault; + drm_sman_t sman; + unsigned long chipset; + int vram_initialized; + int agp_initialized; + unsigned long vram_offset; + unsigned long agp_offset; } drm_sis_private_t; extern int sis_idle(drm_device_t *dev); |