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 'fix/soundcore' into for-linus
[pandora-kernel.git]
/
drivers
/
char
/
agp
/
amd64-agp.c
diff --git
a/drivers/char/agp/amd64-agp.c
b/drivers/char/agp/amd64-agp.c
index
d765afd
..
3bf5dda
100644
(file)
--- a/
drivers/char/agp/amd64-agp.c
+++ b/
drivers/char/agp/amd64-agp.c
@@
-79,7
+79,7
@@
static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
tmp = agp_bridge->driver->mask_memory(agp_bridge,
- mem->
memory
[i], mask_type);
+ mem->
pages
[i], mask_type);
BUG_ON(tmp & 0xffffff0000000ffcULL);
pte = (tmp & 0x000000ff00000000ULL) >> 28;