diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:27:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:27:52 -0800 |
| commit | 0c05384a5a1af2352b8c244cf32f480ba6cbf024 (patch) | |
| tree | 5090f9d2d07d0bccae3144bb0cdbdf15e8555013 /include | |
| parent | 1542dec1c9109fdcd1c53460f064096f24fc49d2 (diff) | |
| parent | bc91c9f313309915f6ec767f56f78dcd0305b20f (diff) | |
| download | linux-3.10-0c05384a5a1af2352b8c244cf32f480ba6cbf024.tar.gz linux-3.10-0c05384a5a1af2352b8c244cf32f480ba6cbf024.tar.bz2 linux-3.10-0c05384a5a1af2352b8c244cf32f480ba6cbf024.zip | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
mkuboot.sh: Fail if mkimage is missing
gen_init_cpio: checkpatch fixes
gen_init_cpio: Avoid race between call to stat() and call to open()
modpost: Fix address calculation in reloc_location()
Make fixdep error handling more explicit
checksyscalls: Fix stand-alone usage
modpost: Put .zdebug* section on white list
kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
kbuild: introduce HDR_ARCH_LIST for headers_install_all
headers_install: check exit status of unifdef
gen_init_cpio: remove leading `/' from file names
scripts/genksyms: fix header usage
fixdep: use hash table instead of a single array
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/Kbuild | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index a354c199ab9..d1580c17cab 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 |