diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 10:47:34 +1000 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /arch/cris/arch-v32/kernel/fasttimer.c | |
| parent | 93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5 (diff) | |
| parent | 4c246edd2550304df5b766cc841584b2bb058843 (diff) | |
| download | op-kernel-dev-86d688984deefa3ae5a802880c11f2b408b5d6cf.zip op-kernel-dev-86d688984deefa3ae5a802880c11f2b408b5d6cf.tar.gz | |
Merge branch 'master' into next
Diffstat (limited to 'arch/cris/arch-v32/kernel/fasttimer.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/fasttimer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c index 2de9d58..111caa1 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c @@ -19,8 +19,6 @@ #include <asm/irq.h> #include <asm/system.h> -#include <linux/version.h> - #include <hwregs/reg_map.h> #include <hwregs/reg_rdwr.h> #include <hwregs/timer_defs.h> |
