diff options
author | 2012-07-19 11:17:30 -0700 | |
---|---|---|
committer | 2012-07-19 11:17:30 -0700 | |
commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /arch/mn10300/unit-asb2364/include/unit/timex.h | |
parent | net-tcp: Fast Open client - cookie-less mode (diff) | |
parent | Merge tag 'md-3.5-fixes' of git://neil.brown.name/md (diff) | |
download | linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.tar.gz linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.tar.bz2 linux-abaa72d7fd9a20a67b62e6afa0e746e27851dc33.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
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 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 @@ #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> |