From 0779e46ecd01e3f0e413cedfff6df7b3b70618c2 Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Sat, 20 Dec 2003 00:28:27 +0000 Subject: merge XFree86 RC2 (4.3.99.902) from vendor branch --- src/radeon_common.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/radeon_common.h') diff --git a/src/radeon_common.h b/src/radeon_common.h index 12ec49f..5f517f5 100644 --- a/src/radeon_common.h +++ b/src/radeon_common.h @@ -31,15 +31,15 @@ * Converted to common header format: * Jens Owen * - * $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.8 2003/12/02 22:29:22 dawes Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.8 2003/12/02 22:29:22 dawes Exp $ + * $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.1.4.2 2003/12/06 13:24:24 kaleb Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.9 + * 2003/12/13 22:07:22 tsi Exp $ * */ #ifndef _RADEON_COMMON_H_ #define _RADEON_COMMON_H_ -#include #include "xf86drm.h" /* WARNING: If you change any of these defines, make sure to change @@ -454,7 +454,7 @@ typedef struct drm_radeon_irq_wait { typedef struct drm_radeon_set_param { unsigned int param; - int64_t value; + long long value; } drmRadeonSetParam; #define RADEON_SETPARAM_FB_LOCATION 1 -- cgit v1.2.3