diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 23:58:24 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-18 23:58:24 +0200 |
| commit | 823d93640927d739f7c918b73fe5ec494fb27e17 (patch) | |
| tree | dea028ddd214541b76c1c26f5f21ddc46157e67e /arch/mn10300/unit-asb2364/include/unit/timex.h | |
| parent | 7664e969359917ba3212c5d6efdec494eaf8586e (diff) | |
| parent | d9914cf66181b8aa0929775f5c6f675c6ebc3eb5 (diff) | |
Merge branch 'fixes' into pm-sleep
The 'fixes' branch contains material the next commit depends on.
Diffstat (limited to 'arch/mn10300/unit-asb2364/include/unit/timex.h')
| -rw-r--r-- | arch/mn10300/unit-asb2364/include/unit/timex.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mn10300/unit-asb2364/include/unit/timex.h b/arch/mn10300/unit-asb2364/include/unit/timex.h index ddb7ed01070..42f32db7508 100644 --- a/arch/mn10300/unit-asb2364/include/unit/timex.h +++ b/arch/mn10300/unit-asb2364/include/unit/timex.h @@ -11,10 +11,6 @@ #ifndef _ASM_UNIT_TIMEX_H #define _ASM_UNIT_TIMEX_H -#ifndef __ASSEMBLY__ -#include <linux/irq.h> -#endif /* __ASSEMBLY__ */ - #include <asm/timer-regs.h> #include <unit/clock.h> #include <asm/param.h> |