aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic/Kbuild.asm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-14 11:23:29 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-14 11:23:29 -0400
commit9dfed08eb4086584205717894177a9ee930c88c4 (patch)
tree3455b242f0e85a86d836858a86bd6ffd21279e22 /include/asm-generic/Kbuild.asm
parent1cf44baad76b6f20f95ece397c6f643320aa44c9 (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
Merge commit 'v2.6.27-rc6' into core/resources
Diffstat (limited to 'include/asm-generic/Kbuild.asm')
-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 1170dc60e638..1870d5e05f1c 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -1,8 +1,10 @@
1ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),) 1ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
2 $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
2header-y += kvm.h 3header-y += kvm.h
3endif 4endif
4 5
5ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) 6ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
7 $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
6unifdef-y += a.out.h 8unifdef-y += a.out.h
7endif 9endif
8unifdef-y += auxvec.h 10unifdef-y += auxvec.h