summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 21:01:37 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 21:01:37 +0200
commit762b8291be6944bd891fbe2c8976a2b2e5bbc726 (patch)
tree4ce2572c050d473bd8dcde8bfbaad0ab830b1b1c /include/asm-generic
parentbootmem: Move node allocation macros back to !HAVE_ARCH_BOOTMEM_NODE (diff)
parentremove dummy asm/kvm.h files (diff)
downloadlinux-762b8291be6944bd891fbe2c8976a2b2e5bbc726.tar.xz
linux-762b8291be6944bd891fbe2c8976a2b2e5bbc726.zip
Merge git://git.infradead.org/~dwmw2/random-2.6
* git://git.infradead.org/~dwmw2/random-2.6: remove dummy asm/kvm.h files firmware: create firmware binaries during 'make modules'.
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/Kbuild.asm2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index 7cd25b8e7c9a..1170dc60e638 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -1,4 +1,6 @@
+ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
header-y += kvm.h
+endif
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
unifdef-y += a.out.h