diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:23:29 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 11:23:29 -0400 |
commit | 9dfed08eb4086584205717894177a9ee930c88c4 (patch) | |
tree | 3455b242f0e85a86d836858a86bd6ffd21279e22 /include/asm-generic/Kbuild.asm | |
parent | 1cf44baad76b6f20f95ece397c6f643320aa44c9 (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (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.asm | 6 |
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 @@ | |||
1 | ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),) | 1 | ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \ |
2 | $(srctree)/include/asm-$(SRCARCH)/kvm.h),) | ||
2 | header-y += kvm.h | 3 | header-y += kvm.h |
3 | endif | 4 | endif |
4 | 5 | ||
5 | ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) | 6 | ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \ |
7 | $(srctree)/include/asm-$(SRCARCH)/a.out.h),) | ||
6 | unifdef-y += a.out.h | 8 | unifdef-y += a.out.h |
7 | endif | 9 | endif |
8 | unifdef-y += auxvec.h | 10 | unifdef-y += auxvec.h |