Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 535e49f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kbuild: fix a.out.h export to userspace with O= build.
parents 0b20715f b6603981

include/asm-generic/Kbuild.asm

+1 −1
Original line number Diff line number Diff line 
header-y  += kvm.h



ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h)

ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

unifdef-y += a.out.h

endif

unifdef-y += auxvec.h

include/asm-powerpc/Kbuild

+0 −1
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



header-y += a.out.h

header-y += auxvec.h

header-y += ioctls.h

header-y += mman.h

include/linux/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ unifdef-y += acct.h 
unifdef-y += adb.h

unifdef-y += adfs_fs.h

unifdef-y += agpgart.h

ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h)

ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)

unifdef-y += a.out.h

endif

unifdef-y += apm_bios.h