summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-12-28 10:01:33 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-12-28 10:01:33 +1100
commita3936a4e1d4ed0d3a3fbd0e12de28c030a18d308 (patch)
tree00dc79b2e12fddd5cccfd1442fb818fc452d30c6 /include
parent3d3547286f6ae90dee82eb965e23ef312b1a1755 (diff)
parenteb0e8491e0e8c9aa0aeca0b213f752a7be71a8c1 (diff)
Merge remote branch 'kbuild/for-next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/Kbuild9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 97319a8fc1e0..ae31f9521a6d 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -20,15 +20,18 @@ header-y += wimax/
objhdr-y += version.h
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
- $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
+ $(srctree)/include/asm-$(SRCARCH)/a.out.h \
+ $(INSTALL_HDR_PATH)/include/asm-*/a.out.h),)
header-y += a.out.h
endif
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
- $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
+ $(srctree)/include/asm-$(SRCARCH)/kvm.h \
+ $(INSTALL_HDR_PATH)/include/asm-*/kvm.h),)
header-y += kvm.h
endif
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
- $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
+ $(srctree)/include/asm-$(SRCARCH)/kvm_para.h \
+ $(INSTALL_HDR_PATH)/include/asm-*/kvm_para.h),)
header-y += kvm_para.h
endif