Sync with 2.4.0-test9-pre4 kernel.

main
Gareth Hughes 2000-09-19 18:14:16 +00:00
parent ce199c73e5
commit 9c8e1adfac
2 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
#include <linux/autoconf.h> #include <linux/config.h>
#include <linux/version.h> #include <linux/version.h>
#ifndef CONFIG_SMP #ifndef CONFIG_SMP

View File

@ -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_MAX_USEC_TIMEOUT 100000 /* 100 ms */
#define R128_BASE(reg) ((unsigned long)(dev_priv->mmio->handle)) #define R128_BASE(reg) ((u32)(dev_priv->mmio->handle))
#define R128_ADDR(reg) (R128_BASE(reg) + reg) #define R128_ADDR(reg) (R128_BASE(reg) + reg)
#define R128_DEREF(reg) *(__volatile__ int *)R128_ADDR(reg) #define R128_DEREF(reg) *(__volatile__ int *)R128_ADDR(reg)