x86: clean up =0 initializations in arch/x86/kernel/tsc_32.c

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

diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 550501fa4fede12048f4a288e6880fc9311bab78..b2e4124070aef289a724a90049bba93adfcffa64 100644 (file)
--- a/include/asm-sh/machvec.h
+++ b/include/asm-sh/machvec.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef _ASM_SH_MACHVEC_H
-#define _ASM_SH_MACHVEC_H 1
+#define _ASM_SH_MACHVEC_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);
@@ -56,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 \
+       __used __section(.machvec.init)
+
 #endif /* _ASM_SH_MACHVEC_H */