diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-07-20 06:53:28 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-07-20 06:53:28 +0200 |
| commit | e6b0b6a82f9c93fe3dd060ae54719456474a74a3 (patch) | |
| tree | 89528134f61971718b1fa363b54bc3c7cebf1392 /arch/mn10300/unit-asb2303/include/unit/timex.h | |
| parent | drm/sis: fixup sis_mm ioctl structs (diff) | |
| parent | Linux 3.5-rc7 (diff) | |
| download | linux-e6b0b6a82f9c93fe3dd060ae54719456474a74a3.tar.xz linux-e6b0b6a82f9c93fe3dd060ae54719456474a74a3.zip | |
Merge tag 'v3.5-rc7' into drm-next
Merge Linus tree into drm to fixup conflicts in radeon code for further
testing before upstream merge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/radeon/radeon_gart.c
Diffstat (limited to 'arch/mn10300/unit-asb2303/include/unit/timex.h')
| -rw-r--r-- | arch/mn10300/unit-asb2303/include/unit/timex.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mn10300/unit-asb2303/include/unit/timex.h b/arch/mn10300/unit-asb2303/include/unit/timex.h index cc18fe7d8b90..c37f9832cf17 100644 --- a/arch/mn10300/unit-asb2303/include/unit/timex.h +++ b/arch/mn10300/unit-asb2303/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> |