Commit ddeb999b authored by Jeff Wiedemeier's avatar Jeff Wiedemeier Committed by Richard Henderson

[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
parent fbf47415
...@@ -980,7 +980,7 @@ marvel_agp_configure(alpha_agp_info *agp) ...@@ -980,7 +980,7 @@ marvel_agp_configure(alpha_agp_info *agp)
} }
static int 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; struct marvel_agp_aperture *aper = agp->aperture.sysdata;
return iommu_bind(aper->arena, aper->pg_start + pg_start, 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) ...@@ -988,7 +988,7 @@ marvel_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, agp_memory *mem)
} }
static int 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; struct marvel_agp_aperture *aper = agp->aperture.sysdata;
return iommu_unbind(aper->arena, aper->pg_start + pg_start, return iommu_unbind(aper->arena, aper->pg_start + pg_start,
......
...@@ -679,7 +679,7 @@ titan_agp_configure(alpha_agp_info *agp) ...@@ -679,7 +679,7 @@ titan_agp_configure(alpha_agp_info *agp)
} }
static int 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; struct titan_agp_aperture *aper = agp->aperture.sysdata;
return iommu_bind(aper->arena, aper->pg_start + pg_start, 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) ...@@ -687,7 +687,7 @@ titan_agp_bind_memory(alpha_agp_info *agp, off_t pg_start, agp_memory *mem)
} }
static int 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; struct titan_agp_aperture *aper = agp->aperture.sysdata;
return iommu_unbind(aper->arena, aper->pg_start + pg_start, return iommu_unbind(aper->arena, aper->pg_start + pg_start,
......
...@@ -33,8 +33,8 @@ struct alpha_agp_ops { ...@@ -33,8 +33,8 @@ struct alpha_agp_ops {
int (*setup)(alpha_agp_info *); int (*setup)(alpha_agp_info *);
void (*cleanup)(alpha_agp_info *); void (*cleanup)(alpha_agp_info *);
int (*configure)(alpha_agp_info *); int (*configure)(alpha_agp_info *);
int (*bind)(alpha_agp_info *, off_t, agp_memory *); int (*bind)(alpha_agp_info *, off_t, struct agp_memory *);
int (*unbind)(alpha_agp_info *, off_t, agp_memory *); int (*unbind)(alpha_agp_info *, off_t, struct agp_memory *);
unsigned long (*translate)(alpha_agp_info *, dma_addr_t); unsigned long (*translate)(alpha_agp_info *, dma_addr_t);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment