summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgareth <gareth>2000-09-19 18:24:09 +0000
committergareth <gareth>2000-09-19 18:24:09 +0000
commitf899c8c89cd594421d585a0b302ef0e67acbfc86 (patch)
tree28948c71880695f28bdce57d7c1c7b70cf0aa5a2
parentf23298044705872cf62946a93e9d88befc39309d (diff)
Correct sync with 2.4.0-test9-pre4 kernel.
-rw-r--r--xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h
index 63b98c727..da2f676d3 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/r128_drv.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/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)