diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:31:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:31:54 -0400 |
commit | 6f74b1849bf04432c4a2fe21f594136e5b9d1fad (patch) | |
tree | 5aa44568b43b931ba4510d68cf040da285b2fc04 /include/asm-generic/Kbuild.asm | |
parent | b693ffe67363119199ffe9f2fac9119475968e8a (diff) | |
parent | b35de672e74ceea6482b4f690ad053aec8465c5d (diff) |
Merge git://git.infradead.org/~dwmw2/dwmw2-2.6.27
* git://git.infradead.org/~dwmw2/dwmw2-2.6.27:
Revert "[ARM] use the new byteorder headers"
Fix conditional export of kvh.h and a.out.h to userspace.
[MTD] [NAND] tmio_nand: fix base address programming
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 |