summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-01-06 13:33:09 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2011-01-06 13:33:09 +1100
commit12501ad65cb7fc24058d591ceef78066d44d7834 (patch)
tree46dd4ee023e468e88e963e28bba50078bda20c57 /include
parentcad128e8928e5ab6f3999265a0736c0a0a00a109 (diff)
parentf4e7e39cd48f764a3aa1b4f93b437e5f462d6be7 (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 d8bc44925e99..2296d8b1931f 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