Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 6477
b: refs/heads/master
c: ceb9c27
h: refs/heads/master
i:
  6475: 1275f41
v: v3
  • Loading branch information
Dave Airlie authored and Dave Airlie committed Jul 10, 2005
1 parent fa35a1d commit 85c385b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d84f76d37c5eebb94c48337958d5a2ff2965c02d
refs/heads/master: ceb9c27aa7d61c70f4c75f017d9fbc9de50034f1
2 changes: 2 additions & 0 deletions trunk/drivers/char/drm/drmP.h
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,8 @@ extern int drm_lock_free(drm_device_t *dev,
unsigned int context);

/* 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_addmap(drm_device_t *dev, unsigned int offset,
unsigned int size, drm_map_type_t type,
drm_map_flags_t flags, drm_map_t **map_ptr);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/char/drm/drm_bufs.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ static void drm_cleanup_buf_error(drm_device_t *dev, drm_buf_entry_t *entry)
* reallocates the buffer list of the same size order to accommodate the new
* buffers.
*/
static int drm_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
int drm_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
{
drm_device_dma_t *dma = dev->dma;
drm_buf_entry_t *entry;
Expand Down Expand Up @@ -564,7 +564,7 @@ static int drm_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
EXPORT_SYMBOL(drm_addbufs_agp);
#endif /* __OS_HAS_AGP */

static int drm_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
int drm_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
{
drm_device_dma_t *dma = dev->dma;
int count;
Expand Down

0 comments on commit 85c385b

Please sign in to comment.