diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2007-12-03 10:54:15 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-02-08 11:06:27 +0100 |
| commit | 8cca29b7137a08f25b05e1cddf7dbc8fe8dfad05 (patch) | |
| tree | a9f400b8d87991bd606e17988eae06ca951adf97 /arch/cris | |
| parent | CRIS v32: Update and simplify kernel/irq.c. (diff) | |
| download | linux-8cca29b7137a08f25b05e1cddf7dbc8fe8dfad05.tar.xz linux-8cca29b7137a08f25b05e1cddf7dbc8fe8dfad05.zip | |
CRIS v32: Minor updates to kernel/process.c
- Shorten include paths for machine dependent header files.
- Remove unused extern declaration of etrax_gpio_wake_up_check.
- Register name for first timer is now regi_timer0.
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v32/kernel/process.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c index b72a15580dc7..ced5b725d9bd 100644 --- a/arch/cris/arch-v32/kernel/process.c +++ b/arch/cris/arch-v32/kernel/process.c @@ -12,17 +12,13 @@ #include <linux/err.h> #include <linux/fs.h> #include <linux/slab.h> -#include <asm/arch/hwregs/reg_rdwr.h> -#include <asm/arch/hwregs/reg_map.h> -#include <asm/arch/hwregs/timer_defs.h> -#include <asm/arch/hwregs/intr_vect_defs.h> +#include <hwregs/reg_rdwr.h> +#include <hwregs/reg_map.h> +#include <hwregs/timer_defs.h> +#include <hwregs/intr_vect_defs.h> extern void stop_watchdog(void); -#ifdef CONFIG_ETRAX_GPIO -extern void etrax_gpio_wake_up_check(void); /* Defined in drivers/gpio.c. */ -#endif - extern int cris_hlt_counter; /* We use this if we don't have any better idle routine. */ @@ -82,7 +78,7 @@ hard_reset_now(void) wd_ctrl.cmd = regk_timer_start; arch_enable_nmi(); - REG_WR(timer, regi_timer, rw_wd_ctrl, wd_ctrl); + REG_WR(timer, regi_timer0, rw_wd_ctrl, wd_ctrl); } #endif |