patch-2.4.23 linux-2.4.23/include/asm-ia64/sn/dmamap.h

Next file: linux-2.4.23/include/asm-ia64/sn/hcl.h
Previous file: linux-2.4.23/include/asm-ia64/sn/cdl.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.22/include/asm-ia64/sn/dmamap.h linux-2.4.23/include/asm-ia64/sn/dmamap.h
@@ -9,7 +9,7 @@
 #ifndef _ASM_IA64_SN_DMAMAP_H
 #define _ASM_IA64_SN_DMAMAP_H
 
-#include <asm/sn/sv.h>
+#include <asm/sn/types.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,33 +41,9 @@
 	int		dma_index;	/* Beginning map register to use */
 	int		dma_size;	/* Number of map registers to use */
 	paddr_t		dma_addr;	/* Corresponding bus addr for A24/A32 */
-	caddr_t		dma_virtaddr;	/* Beginning virtual address that is mapped */
+	unsigned long	dma_virtaddr;	/* Beginning virtual address that is mapped */
 } dmamap_t;
 
-struct alenlist_s;
-
-/*
- * Prototypes of exported functions
- */
-extern dmamap_t	*dma_mapalloc(int, int, int, int);
-extern void	dma_mapfree(dmamap_t *);
-extern int	dma_map(dmamap_t *, caddr_t, int);
-extern int	dma_map2(dmamap_t *, caddr_t, caddr_t, int);
-extern paddr_t	dma_mapaddr(dmamap_t *, caddr_t);
-extern int	dma_map_alenlist(dmamap_t *, struct alenlist_s *, size_t);
-extern uint	ev_kvtoiopnum(caddr_t);
-
-/*
- * These variables are defined in master.d/kernel
- */
-extern struct map *a24map[];
-extern struct map *a32map[];
-
-extern int a24_mapsize;
-extern int a32_mapsize;
-
-extern sv_t dmamapout;
-
 #ifdef __cplusplus
 }
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)