* IMPORTS: these headers contain all the DRI, X and kernel-related
* definitions that we need.
*/
-#include "dri_util.h"
-#include "radeon_common.h"
+/* #include "dri_util.h" */
#include "radeon_dri.h"
#include "radeon_reg.h"
-#include "radeon_sarea.h"
+#include "drm_sarea.h"
#include "xmlconfig.h"
drmBufMapPtr buffers;
- __volatile__ CARD32 *scratch;
+ __volatile__ uint32_t *scratch;
__DRIscreenPrivate *driScreen;
unsigned int sarea_priv_offset;