X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Fmedia%2Fvideobuf-dma-sg.h;h=38105031db23b0d89aaf7f838830e3fdab0efb4f;hb=e5f40bfaf309ec4cc27b717d48fb0824313e5ef8;hp=62a3709905f341798a04691e28123610157d7318;hpb=7a7d9a89d0307b1743d782197e2c5fc5ddf183f3;p=linux-2.6-omap-h63xx.git

diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h
index 62a3709905f..38105031db2 100644
--- a/include/media/videobuf-dma-sg.h
+++ b/include/media/videobuf-dma-sg.h
@@ -86,23 +86,9 @@ struct videbuf_pci_sg_memory
 	u32                 magic;
 
 	/* for mmap'ed buffers */
-	struct videobuf_mapping *map;
 	struct videobuf_dmabuf  dma;
 };
 
-/* FIXME: To be removed soon */
-typedef int (vb_map_sg_t)(void *dev, struct scatterlist *sglist, int nr_pages,
-					int direction);
-
-/* FIXME: To be removed soon */
-struct videobuf_dma_sg_ops
-{
-	vb_map_sg_t	*vb_map_sg;
-	vb_map_sg_t	*vb_dma_sync_sg;
-	vb_map_sg_t	*vb_unmap_sg;
-
-};
-
 void videobuf_dma_init(struct videobuf_dmabuf *dma);
 int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
 			   unsigned long data, unsigned long size);
@@ -134,9 +120,3 @@ void videobuf_queue_pci_init(struct videobuf_queue* q,
 int videobuf_pci_dma_map(struct pci_dev *pci,struct videobuf_dmabuf *dma);
 int videobuf_pci_dma_unmap(struct pci_dev *pci,struct videobuf_dmabuf *dma);
 
-/* FIXME: temporary routine for vivi and tm6000, while lacking implementation
- * of videobuf-vmalloc
- */
-void videobuf_set_pci_ops (struct videobuf_queue* q,
-				struct videobuf_dma_sg_ops *ops);
-