diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
| commit | 45de6fd958d7f407bdb5fdc6914b3262519d891c (patch) | |
| tree | c1b9f9023e93d0f28f773ca4be41d107f79cd600 /drivers/char/drm/drmP.h | |
| parent | 1f5d5dbf0372dd933d8325054889ba09d996e50b (diff) | |
| parent | 3b908870b8332dfd40be0e919e187aa4991536fb (diff) | |
Merge branch 'upstream-fixes' into upstream
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, /* Buffer management support (drm_bufs.h) */ extern int drm_addbufs_agp(drm_device_t * dev, drm_buf_desc_t * request); extern int drm_addbufs_pci(drm_device_t * dev, drm_buf_desc_t * request); -extern int drm_addbufs_fb(drm_device_t *dev, drm_buf_desc_t *request); extern int drm_addmap(drm_device_t * dev, unsigned int offset, unsigned int size, drm_map_type_t type, drm_map_flags_t flags, drm_local_map_t ** map_ptr); |