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-s390 | |
| 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-s390')
| -rw-r--r-- | include/asm-s390/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild index bb5e9edb9825..63a23415fba6 100644 --- a/include/asm-s390/Kbuild +++ b/include/asm-s390/Kbuild | |||
| @@ -7,7 +7,6 @@ header-y += tape390.h | |||
| 7 | header-y += ucontext.h | 7 | header-y += ucontext.h |
| 8 | header-y += vtoc.h | 8 | header-y += vtoc.h |
| 9 | header-y += zcrypt.h | 9 | header-y += zcrypt.h |
| 10 | header-y += kvm.h | ||
| 11 | header-y += chsc.h | 10 | header-y += chsc.h |
| 12 | 11 | ||
| 13 | unifdef-y += cmb.h | 12 | unifdef-y += cmb.h |