X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fsunhme.h;h=efd2ca0fcad30d85362d9f0d1e2412ab49b5e7fc;hb=0cce2eda19923e5e5ccc8b042dec5af87b3ffad0;hp=4da5539fac7b3032f4b1f911a06705cfd2ca0132;hpb=6e5565f949af1322f8f3d3f43d044645ae448499;p=~andy%2Flinux

diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h
index 4da5539fac7..efd2ca0fcad 100644
--- a/drivers/net/sunhme.h
+++ b/drivers/net/sunhme.h
@@ -405,14 +405,11 @@ struct happy_meal {
 	u32 (*read_desc32)(hme32 *);
 	void (*write_txd)(struct happy_meal_txd *, u32, u32);
 	void (*write_rxd)(struct happy_meal_rxd *, u32, u32);
-	u32 (*dma_map)(void *, void *, long, int);
-	void (*dma_unmap)(void *, u32, long, int);
-	void (*dma_sync_for_cpu)(void *, u32, long, int);
-	void (*dma_sync_for_device)(void *, u32, long, int);
 #endif
 
-	/* This is either a sbus_dev or a pci_dev. */
+	/* This is either an of_device or a pci_dev. */
 	void			  *happy_dev;
+	struct device		  *dma_dev;
 
 	spinlock_t		  happy_lock;