diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 17:07:33 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 17:07:33 -0400 |
| commit | 608f593b1313080301b76875487af6da508f67a1 (patch) | |
| tree | b775454cd4d1d380134c2d91ff79d0375987dc64 /arch/mn10300/unit-asb2364 | |
| parent | a1acbbf4adcd346f12fc567143eac90ef33f29b0 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge tag 'v3.5-rc7' into next/boards
Linux 3.5-rc7
Prerequisite for samsung/board3 branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/mn10300/unit-asb2364')
| -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 ddb7ed010706..42f32db75087 100644 --- a/arch/mn10300/unit-asb2364/include/unit/timex.h +++ b/arch/mn10300/unit-asb2364/include/unit/timex.h | |||
| @@ -11,10 +11,6 @@ | |||
| 11 | #ifndef _ASM_UNIT_TIMEX_H | 11 | #ifndef _ASM_UNIT_TIMEX_H |
| 12 | #define _ASM_UNIT_TIMEX_H | 12 | #define _ASM_UNIT_TIMEX_H |
| 13 | 13 | ||
| 14 | #ifndef __ASSEMBLY__ | ||
| 15 | #include <linux/irq.h> | ||
| 16 | #endif /* __ASSEMBLY__ */ | ||
| 17 | |||
| 18 | #include <asm/timer-regs.h> | 14 | #include <asm/timer-regs.h> |
| 19 | #include <unit/clock.h> | 15 | #include <unit/clock.h> |
| 20 | #include <asm/param.h> | 16 | #include <asm/param.h> |