diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 15:30:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 15:30:09 -0400 |
| commit | 31f46717997a83bdf6db0dd04810c0a329eb3148 (patch) | |
| tree | e10ae643fb03226b639d31f07a7ad70a300d448d /drivers/gpu/drm/radeon/radeon.h | |
| parent | 91803b499cca2fe558abad709ce83dc896b80950 (diff) | |
| parent | 2101d6f7ac791e87a274371a07a408f74e40ec49 (diff) | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
agp: amd64, fix pci reference leaks
drm/edid: Allow non-fatal checksum errors in CEA blocks
drm/radeon/kms: suppress a build warning (unused variable)
drm: Fixes linux-next & linux-2.6 checkstack warnings:
nouveau: fix acpi_lid_open undefined
drm/radeon/kms: release AGP bridge at suspend
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 66a37fb75839..669feb689bfc 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
| @@ -576,6 +576,7 @@ typedef int (*radeon_packet3_check_t)(struct radeon_cs_parser *p, | |||
| 576 | */ | 576 | */ |
| 577 | int radeon_agp_init(struct radeon_device *rdev); | 577 | int radeon_agp_init(struct radeon_device *rdev); |
| 578 | void radeon_agp_resume(struct radeon_device *rdev); | 578 | void radeon_agp_resume(struct radeon_device *rdev); |
| 579 | void radeon_agp_suspend(struct radeon_device *rdev); | ||
| 579 | void radeon_agp_fini(struct radeon_device *rdev); | 580 | void radeon_agp_fini(struct radeon_device *rdev); |
| 580 | 581 | ||
| 581 | 582 | ||