diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/char/drm/radeon_drv.h | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/char/drm/radeon_drv.h')
| -rw-r--r-- | drivers/char/drm/radeon_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 498b19b1d641..fac0d5196ce3 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h | |||
| @@ -273,6 +273,7 @@ typedef struct drm_radeon_private { | |||
| 273 | 273 | ||
| 274 | /* starting from here on, data is preserved accross an open */ | 274 | /* starting from here on, data is preserved accross an open */ |
| 275 | uint32_t flags; /* see radeon_chip_flags */ | 275 | uint32_t flags; /* see radeon_chip_flags */ |
| 276 | int is_pci; | ||
| 276 | } drm_radeon_private_t; | 277 | } drm_radeon_private_t; |
| 277 | 278 | ||
| 278 | typedef struct drm_radeon_buf_priv { | 279 | typedef struct drm_radeon_buf_priv { |