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-ia64 | |
| 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-ia64')
| -rw-r--r-- | include/asm-ia64/Kbuild | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/include/asm-ia64/Kbuild b/include/asm-ia64/Kbuild index f1cb00f39c22..15818a18bc52 100644 --- a/include/asm-ia64/Kbuild +++ b/include/asm-ia64/Kbuild | |||
| @@ -1,7 +1,17 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | header-y += break.h fpu.h fpswa.h gcc_intrin.h ia64regs.h \ | 3 | header-y += break.h |
| 4 | intel_intrin.h intrinsics.h perfmon_default_smpl.h \ | 4 | header-y += fpu.h |
| 5 | ptrace_offsets.h rse.h setup.h ucontext.h | 5 | header-y += fpswa.h |
| 6 | header-y += gcc_intrin.h | ||
| 7 | header-y += ia64regs.h | ||
| 8 | header-y += intel_intrin.h | ||
| 9 | header-y += intrinsics.h | ||
| 10 | header-y += perfmon_default_smpl.h | ||
| 11 | header-y += ptrace_offsets.h | ||
| 12 | header-y += rse.h | ||
| 13 | header-y += setup.h | ||
| 14 | header-y += ucontext.h | ||
| 6 | 15 | ||
| 7 | unifdef-y += perfmon.h ustack.h | 16 | unifdef-y += perfmon.h |
| 17 | unifdef-y += ustack.h | ||