diff options
author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2009-09-23 18:57:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 10:21:06 -0400 |
commit | d68721eb339e9237c11c1fea5f73f86211d14918 (patch) | |
tree | 6999b5626ba61e17763b2058b83be6bcd57269db /arch/alpha/kernel/core_titan.c | |
parent | 801460d0cf5c5288153b722565773059b0f44348 (diff) |
alpha: AGP update (fixes compile failure)
This brings Alpha AGP platforms in sync with the change to struct
agp_memory (unsigned long *memory => struct page **pages).
Only compile tested (I don't have titan/marvel hardware), but this change
looks pretty straightforward, so hopefully it's ok.
Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Dave Airlie <airlied@linux.ie>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha/kernel/core_titan.c')
-rw-r--r-- | arch/alpha/kernel/core_titan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c index 319fcb74611..76686497b1e 100644 --- a/arch/alpha/kernel/core_titan.c +++ b/arch/alpha/kernel/core_titan.c | |||
@@ -680,7 +680,7 @@ titan_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, struct agp_memory *me | |||
680 | { | 680 | { |
681 | struct titan_agp_aperture *aper = agp->aperture.sysdata; | 681 | struct titan_agp_aperture *aper = agp->aperture.sysdata; |
682 | return iommu_bind(aper->arena, aper->pg_start + pg_start, | 682 | return iommu_bind(aper->arena, aper->pg_start + pg_start, |
683 | mem->page_count, mem->memory); | 683 | mem->page_count, mem->pages); |
684 | } | 684 | } |
685 | 685 | ||
686 | static int | 686 | static int |