X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fcommon%2Fmmio.h;h=ce95d8c90759f56d8be6b7d02d782a1e66a1dc3e;hb=4b1cbfcbe66161a7b56d56cd9e2c35ce49b3a91d;hp=89871aab59ea1e860fd549eaa56bf03535804463;hpb=71d2578ac5530c8641bcd5d9a9654373a6ce853e;p=mesa.git

diff --git a/src/mesa/drivers/dri/common/mmio.h b/src/mesa/drivers/dri/common/mmio.h
index 89871aab59e..ce95d8c9075 100644
--- a/src/mesa/drivers/dri/common/mmio.h
+++ b/src/mesa/drivers/dri/common/mmio.h
@@ -33,14 +33,14 @@
 #ifndef MMIO_H
 #define MMIO_H
 
-#include "glheader.h"
+#include "main/glheader.h"
 
 #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] );
 }