diff options
| author | Ben Skeggs <[email protected]> | 2008-06-25 04:05:11 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-06-25 04:05:11 +1000 |
| commit | b40ed6a0b54d1ba74799aeb3f529c4d298625aa1 (patch) | |
| tree | da1ae04dcd8c1db1294f3caab9ba28760ccb3f8e /src/mesa/drivers/dri/common/mmio.h | |
| parent | 95fe122f67024f55d555e2816a95409a8b53a49e (diff) | |
| parent | 0561a293b6596641c0200df7e6580599ecb8b111 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/drivers/dri/common/mmio.h')
| -rw-r--r-- | src/mesa/drivers/dri/common/mmio.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/common/mmio.h b/src/mesa/drivers/dri/common/mmio.h index 2b7b4123e5a..891056e1705 100644 --- a/src/mesa/drivers/dri/common/mmio.h +++ b/src/mesa/drivers/dri/common/mmio.h @@ -37,10 +37,10 @@ #if defined( __powerpc__ ) -static __inline__ u_int32_t +static __inline__ uint32_t read_MMIO_LE32( volatile void * base, unsigned long offset ) { - u_int32_t val; + uint32_t val; __asm__ __volatile__( "lwbrx %0, %1, %2 ; eieio" : "=r" (val) @@ -50,10 +50,10 @@ read_MMIO_LE32( volatile void * base, unsigned long offset ) #else -static __inline__ u_int32_t +static __inline__ uint32_t read_MMIO_LE32( volatile void * base, unsigned long offset ) { - volatile u_int32_t * p = (volatile u_int32_t *) (((volatile char *) base) + offset); + volatile uint32_t * p = (volatile uint32_t *) (((volatile char *) base) + offset); return LE32_TO_CPU( p[0] ); } |