diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:56:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:56:22 -0400 |
| commit | e6e5fee1426bef07f4e6c3c76f48343c14207938 (patch) | |
| tree | 28f4ca26cf85e0971e9bb4927c439b36c2b93f51 /include/asm-s390 | |
| parent | 3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e (diff) | |
| parent | fadcfa33b6319a5faf8af2287f08bf93a7f926b6 (diff) | |
Merge git://git.infradead.org/~dwmw2/hdroneline
* git://git.infradead.org/~dwmw2/hdroneline:
[HEADERS] One line per header in Kbuild files to reduce conflicts
Manual (trivial) conflict resolution in include/asm-s390/Kbuild
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/Kbuild | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild index 979145026a29..088969d55e72 100644 --- a/include/asm-s390/Kbuild +++ b/include/asm-s390/Kbuild | |||
| @@ -1,4 +1,12 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | unifdef-y += cmb.h debug.h | 3 | header-y += dasd.h |
| 4 | header-y += dasd.h monwriter.h qeth.h tape390.h ucontext.h vtoc.h z90crypt.h | 4 | header-y += monwriter.h |
| 5 | header-y += qeth.h | ||
| 6 | header-y += tape390.h | ||
| 7 | header-y += ucontext.h | ||
| 8 | header-y += vtoc.h | ||
| 9 | header-y += z90crypt.h | ||
| 10 | |||
| 11 | unifdef-y += cmb.h | ||
| 12 | unifdef-y += debug.h | ||