summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2008-09-04 23:11:01 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-09-05 15:44:31 +0100
commitafbc8d8e72daa5a5faf6a0242186bdfcc42b2427 (patch)
tree8d3c699c56daffdaa1d18507f23044fb7b9fd36f /include/asm-generic
parent076c7f4c6c55c37975c8e04ae6827267794d5d2e (diff)
downloadop-kernel-dev-afbc8d8e72daa5a5faf6a0242186bdfcc42b2427.zip
op-kernel-dev-afbc8d8e72daa5a5faf6a0242186bdfcc42b2427.tar.gz
Fix conditional export of kvh.h and a.out.h to userspace.
Some architectures have moved the asm/ into arch/ and some have not. This patch checks for a.out.h and kvh.h in both places before exporting the corresponding file from linux/ [dwmw2: simplified a little] Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/Kbuild.asm6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index 1170dc6..1870d5e 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -1,8 +1,10 @@
-ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
+ $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
header-y += kvm.h
endif
-ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
+ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
+ $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
unifdef-y += a.out.h
endif
unifdef-y += auxvec.h
OpenPOWER on IntegriCloud