Linus, please apply.
This feature is not actually MA1-specific, so get rid of the `MA1' in
the name.
diff -ruN -X../cludes linux-2.6.0-test1-moo/arch/v850/kernel/intv.S linux-2.6.0-test1-moo-v850-20030718/arch/v850/kernel/intv.S
--- linux-2.6.0-test1-moo/arch/v850/kernel/intv.S 2003-02-25 10:44:59.000000000 +0900
+++ linux-2.6.0-test1-moo-v850-20030718/arch/v850/kernel/intv.S 2003-07-16 17:23:42.000000000 +0900
@@ -16,7 +16,7 @@
#include <asm/machdep.h>
#include <asm/entry.h>
-#ifdef CONFIG_V850E_MA1_HIGHRES_TIMER
+#ifdef CONFIG_V850E_HIGHRES_TIMER
#include <asm/highres_timer.h>
#endif
@@ -59,7 +59,7 @@
.section .intv.mach, "ax"
.org 0x0
-#if defined (CONFIG_V850E_MA1_HIGHRES_TIMER) && defined (IRQ_INTCMD)
+#if defined (CONFIG_V850E_HIGHRES_TIMER) && defined (IRQ_INTCMD)
/* Interrupts before the highres timer interrupt. */
.rept IRQ_INTCMD (HIGHRES_TIMER_TIMER_D_UNIT)
diff -ruN -X../cludes linux-2.6.0-test1-moo/include/asm-v850/entry.h linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/entry.h
--- linux-2.6.0-test1-moo/include/asm-v850/entry.h 2003-02-25 10:45:23.000000000 +0900
+++ linux-2.6.0-test1-moo-v850-20030718/include/asm-v850/entry.h 2003-07-16 17:23:42.000000000 +0900
@@ -65,10 +65,10 @@
#define RESET_GUARD_ACTIVE 0xFAB4BEEF
#endif /* CONFIG_RESET_GUARD */
-#ifdef CONFIG_V850E_MA1_HIGHRES_TIMER
+#ifdef CONFIG_V850E_HIGHRES_TIMER
#define HIGHRES_TIMER_SLOW_TICKS_ADDR (KERNEL_VAR_SPACE_ADDR + 32)
#define HIGHRES_TIMER_SLOW_TICKS KERNEL_VAR (HIGHRES_TIMER_SLOW_TICKS_ADDR)
-#endif /* CONFIG_V850E_MA1_HIGHRES_TIMER */
+#endif /* CONFIG_V850E_HIGHRES_TIMER */
#ifndef __ASSEMBLY__