Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[mv-sheeva.git] / include / asm-sh / machvec.h

diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 088698bacf2f4947b6d1c60bf91bbddc8a26037e..ddb18ad23303ae8a4f26dafdf38da0e3dd83c8fc 100644 (file)
--- a/include/asm-sh/machvec.h
+++ b/include/asm-sh/machvec.h
@@ -56,9 +56,6 @@ struct sh_machine_vector {
 
        void (*mv_heartbeat)(void);
 
-       void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, gfp_t);
-       int (*mv_consistent_free)(struct device *, size_t, void *, dma_addr_t);
-
        void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
        void (*mv_ioport_unmap)(void __iomem *);
 };