summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/Kbuild
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-22 09:06:21 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-22 09:06:21 +0200
commit76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch)
tree3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-ia64/Kbuild
parent7be42004065ce4df193aeef5befd26805267d0d9 (diff)
parent93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff)
downloadtalos-op-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.tar.gz
talos-op-linux-76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b.zip
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/asm-ia64/Kbuild')
-rw-r--r--include/asm-ia64/Kbuild2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild
index eb24a3f47caa..ccbe8ae47a61 100644
--- a/include/asm-ia64/Kbuild
+++ b/include/asm-ia64/Kbuild
@@ -5,12 +5,12 @@ header-y += fpu.h
header-y += fpswa.h
header-y += ia64regs.h
header-y += intel_intrin.h
-header-y += intrinsics.h
header-y += perfmon_default_smpl.h
header-y += ptrace_offsets.h
header-y += rse.h
header-y += ucontext.h
unifdef-y += gcc_intrin.h
+unifdef-y += intrinsics.h
unifdef-y += perfmon.h
unifdef-y += ustack.h
OpenPOWER on IntegriCloud