From 94071289a4c61a1083a3d6b3546b06cafeaeac44 Mon Sep 17 00:00:00 2001 From: David Dawes Date: Wed, 8 Nov 2000 00:07:17 +0000 Subject: merge with 4.0.1d --- linux/r128_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux/r128_drv.h') 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) -- cgit v1.2.3