diff options
| author | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-06-24 14:08:08 -0700 |
| commit | f6abe8f0f2fba3073b58b96ed38aae163c765b4a (patch) | |
| tree | 706ba29d021fb1e4c54500e8773e3dda5f9ff6e8 /src/mesa/drivers/dri/common/mmio.h | |
| parent | a42dac187973cbc17be6c59db89264cbc935ab91 (diff) | |
| parent | 5174b85a0cb13b06779ea6fc0a8362c9fe57e2ea (diff) | |
Merge commit 'origin/master' into drm-gem
Diffstat (limited to 'src/mesa/drivers/dri/common/mmio.h')
| -rw-r--r-- | src/mesa/drivers/dri/common/mmio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/common/mmio.h b/src/mesa/drivers/dri/common/mmio.h index 2b7b4123e5..89871aab59 100644 --- a/src/mesa/drivers/dri/common/mmio.h +++ b/src/mesa/drivers/dri/common/mmio.h @@ -37,7 +37,7 @@ #if defined( __powerpc__ ) -static __inline__ u_int32_t +static INLINE u_int32_t read_MMIO_LE32( volatile void * base, unsigned long offset ) { u_int32_t val; @@ -50,7 +50,7 @@ read_MMIO_LE32( volatile void * base, unsigned long offset ) #else -static __inline__ u_int32_t +static INLINE u_int32_t read_MMIO_LE32( volatile void * base, unsigned long offset ) { volatile u_int32_t * p = (volatile u_int32_t *) (((volatile char *) base) + offset); |