diff options
| author | David Dawes <dawes@xfree86.org> | 2000-11-08 00:07:17 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2000-11-08 00:07:17 +0000 |
| commit | 94071289a4c61a1083a3d6b3546b06cafeaeac44 (patch) | |
| tree | ac34ab78e6e4b842fa14d61d944f26ab1376aa2d /linux/r128_drv.h | |
| parent | 5745cb7fa70cf312d371aac44de3beae2a8d6e47 (diff) | |
merge with 4.0.1dX_4_0_1e-20001107-mergeX_4_0_1d-20001107-merge
Diffstat (limited to 'linux/r128_drv.h')
| -rw-r--r-- | linux/r128_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/r128_drv.h b/linux/r128_drv.h index 63b98c72..da2f676d 100644 --- a/linux/r128_drv.h +++ b/linux/r128_drv.h @@ -197,7 +197,7 @@ extern int r128_context_switch_complete(drm_device_t *dev, int new); #define R128_MAX_USEC_TIMEOUT 100000 /* 100 ms */ -#define R128_BASE(reg) ((u32)(dev_priv->mmio->handle)) +#define R128_BASE(reg) ((unsigned long)(dev_priv->mmio->handle)) #define R128_ADDR(reg) (R128_BASE(reg) + reg) #define R128_DEREF(reg) *(__volatile__ int *)R128_ADDR(reg) |