patch-2.4.10 linux/include/asm-sh/machvec.h

Next file: linux/include/asm-sh/mmu_context.h
Previous file: linux/include/asm-sh/linux_logo.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/include/asm-sh/machvec.h linux/include/asm-sh/machvec.h
@@ -76,6 +76,8 @@
 	unsigned int mv_hw_hd64465 : 1;
 	unsigned int mv_hw_dreamcast : 1;
 	unsigned int mv_hw_bigsur : 1;
+	unsigned int mv_hw_7751se: 1;
+	unsigned int mv_hw_adx : 1;
 };
 
 extern struct sh_machine_vector sh_mv;
@@ -92,13 +94,19 @@
 #define MACH_SH2000	(sh_mv.mv_hw_sh2000)
 #define MACH_DREAMCAST	(sh_mv.mv_hw_dreamcast)
 #define MACH_BIGSUR	(sh_mv.mv_hw_bigsur)
+#define MACH_7751SE	(sh_mv.mv_hw_7751se)
+#define MACH_ADX	(sh_mv.mv_hw_adx)
 #else
-# if defined(CONFIG_SH_SOLUTION_ENGINE) || \
-     defined(CONFIG_SH_7751_SOLUTION_ENGINE)
+# ifdef CONFIG_SH_SOLUTION_ENGINE
 #  define MACH_SE		1
 # else
 #  define MACH_SE		0
 # endif
+# ifdef CONFIG_SH_7751_SOLUTION_ENGINE
+#  define MACH_7751SE		1
+# else
+#  define MACH_7751SE		0
+# endif
 # ifdef CONFIG_SH_HP600
 #  define MACH_HP600		1
 # else
@@ -119,7 +127,6 @@
 # else
 #  define MACH_HP690		0
 # endif
-# endif
 # ifdef CONFIG_HD64461
 #  define MACH_HD64461		1
 # else
@@ -149,6 +156,12 @@
 #  define MACH_BIGSUR		1
 # else
 #  define MACH_BIGSUR		0
+# endif
+# ifdef CONFIG_SH_ADX
+#  define MACH_ADX		1
+# else
+#  define MACH_ADX		0
+# endif
 #endif
 
 #endif /* _ASM_SH_MACHVEC_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)