Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 84022
b: refs/heads/master
c: ded2335
h: refs/heads/master
v: v3
  • Loading branch information
Dave Airlie authored and Dave Airlie committed Feb 7, 2008
1 parent 8b38227 commit 5bb426c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 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: bc5f4523f772cc7629c5c5a46cf4f2a07a5500b8
refs/heads/master: ded23359ccb884605336ac2193608a7af9a3b117
5 changes: 2 additions & 3 deletions trunk/drivers/char/drm/drmP.h
Original file line number Diff line number Diff line change
Expand Up @@ -847,6 +847,8 @@ extern int drm_release(struct inode *inode, struct file *filp);

/* Mapping support (drm_vm.h) */
extern int drm_mmap(struct file *filp, struct vm_area_struct *vma);
extern unsigned long drm_core_get_map_ofs(struct drm_map * map);
extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait);

/* Memory management support (drm_memory.h) */
Expand Down Expand Up @@ -1144,8 +1146,5 @@ extern void *drm_calloc(size_t nmemb, size_t size, int area);

/*@}*/

extern unsigned long drm_core_get_map_ofs(struct drm_map * map);
extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);

#endif /* __KERNEL__ */
#endif

0 comments on commit 5bb426c

Please sign in to comment.