aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-29 15:21:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-29 15:21:56 -0400
commit535e49f48e2fc95a6de8efb366ca8af35d424642 (patch)
tree11bf5bf2a88a687f7cb7c63b522a6e6eba12a42d /include/linux
parent0b20715f3f83141ab5a2bb14b844b7c3c8bcf1aa (diff)
parentb660398101cd0622325480a67ac88bb4d33d553a (diff)
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/linux')
-rw-r--r--include/linux/Kbuild2
1 files changed, 1 insertions, 1 deletions
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
166unifdef-y += adb.h 166unifdef-y += adb.h
167unifdef-y += adfs_fs.h 167unifdef-y += adfs_fs.h
168unifdef-y += agpgart.h 168unifdef-y += agpgart.h
169ifeq ($(wildcard include/asm-$(SRCARCH)/a.out.h),include/asm-$(SRCARCH)/a.out.h) 169ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
170unifdef-y += a.out.h 170unifdef-y += a.out.h
171endif 171endif
172unifdef-y += apm_bios.h 172unifdef-y += apm_bios.h