diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-10-09 08:18:10 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-10-09 08:18:10 -0400 |
| commit | ab08ff34b44f752b664ebb312d2e110cf37a7f5e (patch) | |
| tree | 80579bb79480ac303cad99c359549d4e86bcc773 /arch/s390/include/asm/Kbuild | |
| parent | 450e47da67499aeb6f1700e8f84747460c11ab56 (diff) | |
| parent | 9807f75955ea7f1877981056755284481873115c (diff) | |
Merge tag 'disintegrate-s390-20121009' of
git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI patchset from David Howells:
"Can you merge the following branch into the s390 tree please.
This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently."
Conflicts:
arch/s390/include/asm/chpid.h
Diffstat (limited to 'arch/s390/include/asm/Kbuild')
| -rw-r--r-- | arch/s390/include/asm/Kbuild | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index f18fc796beef..0633dc6d254d 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild | |||
| @@ -1,17 +1,3 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | ||
| 2 | 1 | ||
| 3 | header-y += chpid.h | ||
| 4 | header-y += chsc.h | ||
| 5 | header-y += cmb.h | ||
| 6 | header-y += dasd.h | ||
| 7 | header-y += debug.h | ||
| 8 | header-y += kvm_virtio.h | ||
| 9 | header-y += monwriter.h | ||
| 10 | header-y += qeth.h | ||
| 11 | header-y += schid.h | ||
| 12 | header-y += tape390.h | ||
| 13 | header-y += ucontext.h | ||
| 14 | header-y += vtoc.h | ||
| 15 | header-y += zcrypt.h | ||
| 16 | 2 | ||
| 17 | generic-y += clkdev.h | 3 | generic-y += clkdev.h |