diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 09:55:47 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 09:55:47 +0100 |
| commit | b71d4da092801634d04190693a38ca03bdbe2505 (patch) | |
| tree | e4adc88ade5832b844768c114b15d4d97253c4d0 /drivers/char/drm/radeon_drv.h | |
| parent | [libata] Print out SATA speed, if link is up (diff) | |
| parent | Linux v2.6.15-rc3 (diff) | |
| download | linux-b71d4da092801634d04190693a38ca03bdbe2505.tar.xz linux-b71d4da092801634d04190693a38ca03bdbe2505.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/drm/radeon_drv.h')
| -rw-r--r-- | drivers/char/drm/radeon_drv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 120ee5a8ebcc..7bda7e33d2bd 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h @@ -214,8 +214,6 @@ typedef struct drm_radeon_private { int microcode_version; - int is_pci; - struct { u32 boxes; int freelist_timeouts; @@ -275,6 +273,7 @@ typedef struct drm_radeon_private { /* starting from here on, data is preserved accross an open */ uint32_t flags; /* see radeon_chip_flags */ + int is_pci; } drm_radeon_private_t; typedef struct drm_radeon_buf_priv { |