diff options
| author | Jeff Wiedemeier <jeff.wiedemeier@hp.com> | 2003-06-04 04:28:50 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@kanga.twiddle.net> | 2003-06-04 04:28:50 -0700 |
| commit | ddeb999bf3a44862141dc81fc760ed4353ce64b4 (patch) | |
| tree | a02fb7322aa02972670d86f6cfc25bfb1807cd7a | |
| parent | fbf47415732b00ff5578d55c6be779a109a01e1f (diff) | |
[PATCH] compile fix for agp_memory struct definitition change
In 2.5.70, the agp_memory struct changed from:
typedef struct agp_memory
to:
struct agp_memory
This patch propagates that change into include/asm-alpha/agp_backend.h and
arch/alpha/kernel/core_{titan,marvel}.c
/jeff
| -rw-r--r-- | arch/alpha/kernel/core_marvel.c | 4 | ||||
| -rw-r--r-- | arch/alpha/kernel/core_titan.c | 4 | ||||
| -rw-r--r-- | include/asm-alpha/agp_backend.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index 9f660ea72ddc..52d27b27ebe5 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/arch/alpha/kernel/core_marvel.c @@ -980,7 +980,7 @@ marvel_agp_configure(alpha_agp_info *agp) } static int -marvel_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, agp_memory *mem) +marvel_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, struct agp_memory *mem) { struct marvel_agp_aperture *aper = agp->aperture.sysdata; return iommu_bind(aper->arena, aper->pg_start + pg_start, @@ -988,7 +988,7 @@ marvel_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, agp_memory *mem) } static int -marvel_agp_unbind_memory(alpha_agp_info *agp, off_t pg_start, agp_memory *mem) +marvel_agp_unbind_memory(alpha_agp_info *agp, off_t pg_start, struct agp_memory *mem) { struct marvel_agp_aperture *aper = agp->aperture.sysdata; return iommu_unbind(aper->arena, aper->pg_start + pg_start, diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c index e47649d3bbf9..86e4ca9c5c10 100644 --- a/arch/alpha/kernel/core_titan.c +++ b/arch/alpha/kernel/core_titan.c @@ -679,7 +679,7 @@ titan_agp_configure(alpha_agp_info *agp) } static int -titan_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, agp_memory *mem) +titan_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, struct agp_memory *mem) { struct titan_agp_aperture *aper = agp->aperture.sysdata; return iommu_bind(aper->arena, aper->pg_start + pg_start, @@ -687,7 +687,7 @@ titan_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, agp_memory *mem) } static int -titan_agp_unbind_memory(alpha_agp_info *agp, off_t pg_start, agp_memory *mem) +titan_agp_unbind_memory(alpha_agp_info *agp, off_t pg_start, struct agp_memory *mem) { struct titan_agp_aperture *aper = agp->aperture.sysdata; return iommu_unbind(aper->arena, aper->pg_start + pg_start, diff --git a/include/asm-alpha/agp_backend.h b/include/asm-alpha/agp_backend.h index 3998e2547545..55dd44a2cea7 100644 --- a/include/asm-alpha/agp_backend.h +++ b/include/asm-alpha/agp_backend.h @@ -33,8 +33,8 @@ struct alpha_agp_ops { int (*setup)(alpha_agp_info *); void (*cleanup)(alpha_agp_info *); int (*configure)(alpha_agp_info *); - int (*bind)(alpha_agp_info *, off_t, agp_memory *); - int (*unbind)(alpha_agp_info *, off_t, agp_memory *); + int (*bind)(alpha_agp_info *, off_t, struct agp_memory *); + int (*unbind)(alpha_agp_info *, off_t, struct agp_memory *); unsigned long (*translate)(alpha_agp_info *, dma_addr_t); }; |