aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 12:01:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 12:01:37 -0700
commit762b8291be6944bd891fbe2c8976a2b2e5bbc726 (patch)
tree4ce2572c050d473bd8dcde8bfbaad0ab830b1b1c /include/linux/Kbuild
parentc6af5e9f8a57467df2e55e428316a43480174521 (diff)
parent7dcf2a9fced59e58e4694cdcf15850c01fdba89b (diff)
downloadlinux-762b8291be6944bd891fbe2c8976a2b2e5bbc726.tar.gz
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/linux/Kbuild')
-rw-r--r--include/linux/Kbuild2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index a18008ce7aba6f..4c4142c5aa6ef2 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -255,7 +255,9 @@ unifdef-y += kd.h
unifdef-y += kernelcapi.h
unifdef-y += kernel.h
unifdef-y += keyboard.h
+ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
unifdef-y += kvm.h
+endif
unifdef-y += llc.h
unifdef-y += loop.h
unifdef-y += lp.h