Commit ae51f84c authored by Miles Bader's avatar Miles Bader Committed by Linus Torvalds

[PATCH] Rename config option CONFIG_V850E_MA1_HIGHRES_TIMER on v850

This feature is not actually MA1-specific, so get rid of the `MA1' in
the name.
parent 992f6cd4
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/entry.h> #include <asm/entry.h>
#ifdef CONFIG_V850E_MA1_HIGHRES_TIMER #ifdef CONFIG_V850E_HIGHRES_TIMER
#include <asm/highres_timer.h> #include <asm/highres_timer.h>
#endif #endif
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
.section .intv.mach, "ax" .section .intv.mach, "ax"
.org 0x0 .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. */ /* Interrupts before the highres timer interrupt. */
.rept IRQ_INTCMD (HIGHRES_TIMER_TIMER_D_UNIT) .rept IRQ_INTCMD (HIGHRES_TIMER_TIMER_D_UNIT)
......
...@@ -65,10 +65,10 @@ ...@@ -65,10 +65,10 @@
#define RESET_GUARD_ACTIVE 0xFAB4BEEF #define RESET_GUARD_ACTIVE 0xFAB4BEEF
#endif /* CONFIG_RESET_GUARD */ #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_ADDR (KERNEL_VAR_SPACE_ADDR + 32)
#define HIGHRES_TIMER_SLOW_TICKS KERNEL_VAR (HIGHRES_TIMER_SLOW_TICKS_ADDR) #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__ #ifndef __ASSEMBLY__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment