diff options
author | Dave Airlie <airlied@linux.ie> | 2007-07-16 10:05:20 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2007-07-16 10:05:20 +1000 |
commit | 2134193af6c29fcb83408b2878facd4b9cc4c4c8 (patch) | |
tree | 694a3fcf065653acd620909a3ecfdd6ac88c98ec /linux-core/drm_compat.c | |
parent | bc7d6c76fab2ff4d2f11b6bd84ca8b8f124729fd (diff) | |
parent | 2c9e05cf4c6eb18c941321f764ed1b282a314ba9 (diff) |
Merge branch 'drm-ttm-cleanup-branch'
Diffstat (limited to 'linux-core/drm_compat.c')
-rw-r--r-- | linux-core/drm_compat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/drm_compat.c b/linux-core/drm_compat.c index 08d20d06..5d1d62fa 100644 --- a/linux-core/drm_compat.c +++ b/linux-core/drm_compat.c @@ -196,7 +196,8 @@ static int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr, return ret; } -static struct page *drm_bo_vm_fault(struct vm_area_struct *vma, + +static struct page *drm_bo_vm_fault(struct vm_area_struct *vma, struct fault_data *data) { unsigned long address = data->address; |