git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
drm_vm.c
diff --git
a/drivers/gpu/drm/drm_vm.c
b/drivers/gpu/drm/drm_vm.c
index
2c3fcbd
..
5db96d4
100644
(file)
--- a/
drivers/gpu/drm/drm_vm.c
+++ b/
drivers/gpu/drm/drm_vm.c
@@
-526,7
+526,7
@@
static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
static resource_size_t drm_core_get_reg_ofs(struct drm_device *dev)
{
#ifdef __alpha__
- return dev->hose->dense_mem_base
- dev->hose->mem_space->start
;
+ return dev->hose->dense_mem_base;
#else
return 0;
#endif