[patch 2.5.70][alpha] compile fix for agp_memory struct definitition change

From: Wiedemeier, Jeff (Jeff.Wiedemeier@hp.com)
Date: Mon Jun 02 2003 - 07:20:17 EST


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

---
diff -Nuar linux-2.5.70/arch/alpha/kernel/core_marvel.c alpha_agp/arch/alpha/kernel/core_marvel.c
--- linux-2.5.70/arch/alpha/kernel/core_marvel.c	Mon May 26 21:00:22 2003
+++ alpha_agp/arch/alpha/kernel/core_marvel.c	Tue May 27 09:13:14 2003
@@ -980,7 +980,7 @@
 }
 
 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 @@
 }
 
 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 -Nuar linux-2.5.70/arch/alpha/kernel/core_titan.c alpha_agp/arch/alpha/kernel/core_titan.c
--- linux-2.5.70/arch/alpha/kernel/core_titan.c	Mon May 26 21:00:27 2003
+++ alpha_agp/arch/alpha/kernel/core_titan.c	Tue May 27 09:14:12 2003
@@ -679,7 +679,7 @@
 }
 
 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 @@
 }
 
 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 -Nuar linux-2.5.70/include/asm-alpha/agp_backend.h alpha_agp/include/asm-alpha/agp_backend.h
--- linux-2.5.70/include/asm-alpha/agp_backend.h	Mon May 26 21:00:19 2003
+++ alpha_agp/include/asm-alpha/agp_backend.h	Tue May 27 09:12:28 2003
@@ -33,8 +33,8 @@
 	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);
 };
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Jun 07 2003 - 22:00:16 EST