summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 16:21:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-14 16:21:50 -0700
commit5d7cb157025b3b4852f38e6e5e97d06ef12c1d78 (patch)
tree09831b553687b51749ed99dbabaf3687a4e4bd2a /arch/ia64/include/asm
parentfc58fb180755cdeda3ce58776eef94a01b37a1c1 (diff)
parent8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7 (diff)
downloadblackbird-op-linux-5d7cb157025b3b4852f38e6e5e97d06ef12c1d78.tar.gz
blackbird-op-linux-5d7cb157025b3b4852f38e6e5e97d06ef12c1d78.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup: defconfig reduction kbuild: drop unifdef-y support archs: replace unifdef-y with header-y include: replace unifdef-y with header-y
Diffstat (limited to 'arch/ia64/include/asm')
-rw-r--r--arch/ia64/include/asm/Kbuild9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index c7d0a71b9242..241d1c53ba69 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -2,14 +2,13 @@ include include/asm-generic/Kbuild.asm
header-y += break.h
header-y += fpu.h
+header-y += gcc_intrin.h
header-y += ia64regs.h
header-y += intel_intrin.h
+header-y += intrinsics.h
+header-y += perfmon.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
+header-y += ustack.h
OpenPOWER on IntegriCloud