diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 15:01:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 15:01:37 -0400 |
| commit | 762b8291be6944bd891fbe2c8976a2b2e5bbc726 (patch) | |
| tree | 4ce2572c050d473bd8dcde8bfbaad0ab830b1b1c /include/asm-generic | |
| parent | c6af5e9f8a57467df2e55e428316a43480174521 (diff) | |
| parent | 7dcf2a9fced59e58e4694cdcf15850c01fdba89b (diff) | |
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.asm | 2 |
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 @@ | |||
| 1 | ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),) | ||
| 1 | header-y += kvm.h | 2 | header-y += kvm.h |
| 3 | endif | ||
| 2 | 4 | ||
| 3 | ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) | 5 | ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) |
| 4 | unifdef-y += a.out.h | 6 | unifdef-y += a.out.h |