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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
char
/
agp
/
nvidia-agp.c
diff --git
a/drivers/char/agp/nvidia-agp.c
b/drivers/char/agp/nvidia-agp.c
index
16acee2
..
263d71d
100644
(file)
--- a/
drivers/char/agp/nvidia-agp.c
+++ b/
drivers/char/agp/nvidia-agp.c
@@
-225,7
+225,7
@@
static int nvidia_insert_memory(struct agp_memory *mem, off_t pg_start, int type
}
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
writel(agp_bridge->driver->mask_memory(agp_bridge,
- mem->
memory
[i], mask_type),
+ mem->
pages
[i], mask_type),
agp_bridge->gatt_table+nvidia_private.pg_offset+j);
}