diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 12:41:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-23 12:41:20 -0400 |
| commit | 950709a8961e2dde05bc55dca29b2d2e54a6d3ec (patch) | |
| tree | f7f43152e3d49c36ba74d2fcb340c2f25ea6ae55 /drivers/char/drm/drmP.h | |
| parent | 41bc3982b99973d93b5c49598ebd1c34a21127af (diff) | |
| parent | 5d23fafb1bf8ef071738026c2e5071a92186d5f8 (diff) | |
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: possible cleanups
drm: fixup r300 scratch on BE machines
Diffstat (limited to 'drivers/char/drm/drmP.h')
| -rw-r--r-- | drivers/char/drm/drmP.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index e1aadae00623..cb76e5ca9a23 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
| @@ -889,7 +889,6 @@ extern int drm_lock_free(drm_device_t * dev, | |||
| 889 | /* Buffer management support (drm_bufs.h) */ | 889 | /* Buffer management support (drm_bufs.h) */ |
| 890 | extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request); | 890 | extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request); |
| 891 | extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request); | 891 | extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request); |
| 892 | extern int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request); | ||
| 893 | extern int drm_addmap(drm_device_t * dev, unsigned int offset, | 892 | extern int drm_addmap(drm_device_t * dev, unsigned int offset, |
| 894 | unsigned int size, drm_map_type_t type, | 893 | unsigned int size, drm_map_type_t type, |
| 895 | drm_map_flags_t flags, drm_local_map_t ** map_ptr); | 894 | drm_map_flags_t flags, drm_local_map_t ** map_ptr); |