diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 12:01:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 12:01:37 -0700 |
commit | 762b8291be6944bd891fbe2c8976a2b2e5bbc726 (patch) | |
tree | 4ce2572c050d473bd8dcde8bfbaad0ab830b1b1c /include/linux/Kbuild | |
parent | c6af5e9f8a57467df2e55e428316a43480174521 (diff) | |
parent | 7dcf2a9fced59e58e4694cdcf15850c01fdba89b (diff) | |
download | linux-3.10-762b8291be6944bd891fbe2c8976a2b2e5bbc726.tar.gz linux-3.10-762b8291be6944bd891fbe2c8976a2b2e5bbc726.tar.bz2 linux-3.10-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/linux/Kbuild')
-rw-r--r-- | include/linux/Kbuild | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index a18008ce7ab..4c4142c5aa6 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 |