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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
i810
/
i810_drv.h
diff --git
a/drivers/gpu/drm/i810/i810_drv.h
b/drivers/gpu/drm/i810/i810_drv.h
index
0118849
..
21e2691
100644
(file)
--- a/
drivers/gpu/drm/i810/i810_drv.h
+++ b/
drivers/gpu/drm/i810/i810_drv.h
@@
-77,8
+77,8
@@
typedef struct _drm_i810_ring_buffer {
} drm_i810_ring_buffer_t;
typedef struct drm_i810_private {
- struct drm_map *sarea_map;
- struct drm_map *mmio_map;
+ struct drm_
local_
map *sarea_map;
+ struct drm_
local_
map *mmio_map;
drm_i810_sarea_t *sarea_priv;
drm_i810_ring_buffer_t ring;