diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 07:41:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 07:41:27 -0400 |
| commit | 2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b (patch) | |
| tree | 45c4575110c61ca181196c038e1579f0f4fb0174 /include/asm-s390/Kbuild | |
| parent | 34646bca474142e1424e5f6c4a33cb2ba0930ea1 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/paravirt-spinlocks
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-s390/Kbuild')
| -rw-r--r-- | include/asm-s390/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild index 09f312501eb5..bb5e9edb9825 100644 --- a/include/asm-s390/Kbuild +++ b/include/asm-s390/Kbuild | |||
| @@ -8,9 +8,9 @@ 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 | 10 | header-y += kvm.h |
| 11 | header-y += schid.h | ||
| 12 | header-y += chsc.h | 11 | header-y += chsc.h |
| 13 | 12 | ||
| 14 | unifdef-y += cmb.h | 13 | unifdef-y += cmb.h |
| 15 | unifdef-y += debug.h | 14 | unifdef-y += debug.h |
| 16 | unifdef-y += chpid.h | 15 | unifdef-y += chpid.h |
| 16 | unifdef-y += schid.h | ||