Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[sfrench/cifs-2.6.git] / arch / cris / arch-v32 / kernel / process.c

diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 843513102d3cfcbb94404b0a56edd08daa6b9178..ced5b725d9bd0a1ec2d5da7495877c30e3dbf95d 100644 (file)
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -8,22 +8,17 @@
  * This file handles the architecture-dependent parts of process handling..
  */
 
-#include <linux/config.h>
 #include <linux/sched.h>
 #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. */
@@ -83,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
 
@@ -163,7 +158,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
        /* Put the switch stack right below the pt_regs. */
        swstack = ((struct switch_stack *) childregs) - 1;
 
-       /* Paramater to ret_from_sys_call. 0 is don't restart the syscall. */
+       /* Parameter to ret_from_sys_call. 0 is don't restart the syscall. */
        swstack->r9 = 0;
 
        /*