summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth Hughes <gareth@users.sourceforge.net>2000-09-19 18:24:09 +0000
committerGareth Hughes <gareth@users.sourceforge.net>2000-09-19 18:24:09 +0000
commite2a16e1906592636e5e0e5ed82db776466b7e494 (patch)
tree82a11c3c2fbbbba0336f9bc8517187171e7d3c6a
parent9c8e1adfac249ee2a4d10e7ae32fc439c22fb8f6 (diff)
Correct sync with 2.4.0-test9-pre4 kernel.
-rw-r--r--linux/r128_drv.h2
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)