Merge branch 'fixes-2.6.23' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...

[sfrench/cifs-2.6.git] / include / asm-sh / machvec.h

diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 550501fa4fede12048f4a288e6880fc9311bab78..088698bacf2f4947b6d1c60bf91bbddc8a26037e 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);
@@ -65,4 +65,9 @@ struct sh_machine_vector {
 
 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 */