diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 12:21:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-29 12:21:56 -0700 |
| commit | 535e49f48e2fc95a6de8efb366ca8af35d424642 (patch) | |
| tree | 11bf5bf2a88a687f7cb7c63b522a6e6eba12a42d /include | |
| parent | 0b20715f3f83141ab5a2bb14b844b7c3c8bcf1aa (diff) | |
| parent | b660398101cd0622325480a67ac88bb4d33d553a (diff) | |
| download | linux-535e49f48e2fc95a6de8efb366ca8af35d424642.tar.gz linux-535e49f48e2fc95a6de8efb366ca8af35d424642.tar.bz2 linux-535e49f48e2fc95a6de8efb366ca8af35d424642.zip | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/Kbuild.asm | 2 | ||||
| -rw-r--r-- | include/asm-powerpc/Kbuild | 1 | ||||
| -rw-r--r-- | include/linux/Kbuild | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm index 92a6d91d0c1a..7cd25b8e7c9a 100644 --- a/include/asm-generic/Kbuild.asm +++ b/include/asm-generic/Kbuild.asm @@ -1,6 +1,6 @@ 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 diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild index 7381916dfcbb..bca352e033c3 100644 --- a/include/asm-powerpc/Kbuild +++ b/include/asm-powerpc/Kbuild @@ -1,6 +1,5 @@ include include/asm-generic/Kbuild.asm -header-y += a.out.h header-y += auxvec.h header-y += ioctls.h header-y += mman.h diff --git a/include/linux/Kbuild b/include/linux/Kbuild index b6fbb2573e88..71d70d1fbce2 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -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 |