diff options
Diffstat (limited to 'arch/m68k/coldfire')
| -rw-r--r-- | arch/m68k/coldfire/entry.S | 2 | ||||
| -rw-r--r-- | arch/m68k/coldfire/gpio.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S index 52d312d5b4d4..d43a02795a4a 100644 --- a/arch/m68k/coldfire/entry.S +++ b/arch/m68k/coldfire/entry.S @@ -108,7 +108,7 @@ ret_from_exception: btst #5,%sp@(PT_OFF_SR) /* check if returning to kernel */ jeq Luser_return /* if so, skip resched, signals */ -#ifdef CONFIG_PREEMPT +#ifdef CONFIG_PREEMPTION movel %sp,%d1 /* get thread_info pointer */ andl #-THREAD_SIZE,%d1 /* at base of kernel stack */ movel %d1,%a0 diff --git a/arch/m68k/coldfire/gpio.c b/arch/m68k/coldfire/gpio.c index a83898426127..ca26de257871 100644 --- a/arch/m68k/coldfire/gpio.c +++ b/arch/m68k/coldfire/gpio.c @@ -9,6 +9,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/device.h> +#include <linux/gpio/driver.h> #include <linux/io.h> #include <asm/coldfire.h> |
