[IPV4]: Remove unused multipath cached routing defintion in net/flow.h

[linux-2.6] / include / asm-sh / machvec.h

diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 550c50a7359e2018345d84735444e1c70586ca0b..ddb18ad23303ae8a4f26dafdf38da0e3dd83c8fc 100644 (file)
--- a/include/asm-sh/machvec.h
+++ b/include/asm-sh/machvec.h
@@ -8,18 +8,17 @@
  */
 
 #ifndef _ASM_SH_MACHVEC_H
-#define _ASM_SH_MACHVEC_H 1
+#define _ASM_SH_MACHVEC_H
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/time.h>
-
 #include <asm/machtypes.h>
-#include <asm/machvec_init.h>
 
 struct device;
 
 struct sh_machine_vector {
+       void (*mv_setup)(char **cmdline_p);
+       const char *mv_name;
        int mv_nr_irqs;
 
        u8 (*mv_inb)(unsigned long);
@@ -57,13 +56,15 @@ 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 *);
 };
 
 extern struct sh_machine_vector sh_mv;
 
+#define get_system_type()      sh_mv.mv_name
+
+#define __initmv \
+       __attribute_used__ __attribute__((__section__ (".machvec.init")))
+
 #endif /* _ASM_SH_MACHVEC_H */