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-x86 | |
| 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-x86')
| -rw-r--r-- | include/asm-x86/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index 00473f7dd819..4a8e80cdcfa5 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild | |||
| @@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm | |||
| 3 | header-y += boot.h | 3 | header-y += boot.h |
| 4 | header-y += bootparam.h | 4 | header-y += bootparam.h |
| 5 | header-y += debugreg.h | 5 | header-y += debugreg.h |
| 6 | header-y += kvm.h | ||
| 7 | header-y += ldt.h | 6 | header-y += ldt.h |
| 8 | header-y += msr-index.h | 7 | header-y += msr-index.h |
| 9 | header-y += prctl.h | 8 | header-y += prctl.h |