diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /arch/cris/arch-v32/kernel/fasttimer.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
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 2de9d5849ef0..111caa1a2efb 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | #include <asm/irq.h> | 19 | #include <asm/irq.h> |
| 20 | #include <asm/system.h> | 20 | #include <asm/system.h> |
| 21 | 21 | ||
| 22 | #include <linux/version.h> | ||
| 23 | |||
| 24 | #include <hwregs/reg_map.h> | 22 | #include <hwregs/reg_map.h> |
| 25 | #include <hwregs/reg_rdwr.h> | 23 | #include <hwregs/reg_rdwr.h> |
| 26 | #include <hwregs/timer_defs.h> | 24 | #include <hwregs/timer_defs.h> |