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-x86_64 | |
| 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-x86_64')
| -rw-r--r-- | include/asm-x86_64/Kbuild | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild index dc4d101e8a16..40f2f13fe174 100644 --- a/include/asm-x86_64/Kbuild +++ b/include/asm-x86_64/Kbuild | |||
| @@ -4,8 +4,18 @@ ALTARCH := i386 | |||
| 4 | ARCHDEF := defined __x86_64__ | 4 | ARCHDEF := defined __x86_64__ |
| 5 | ALTARCHDEF := defined __i386__ | 5 | ALTARCHDEF := defined __i386__ |
| 6 | 6 | ||
| 7 | header-y += boot.h bootsetup.h cpufeature.h debugreg.h ldt.h \ | 7 | header-y += boot.h |
| 8 | msr.h prctl.h setup.h sigcontext32.h ucontext.h \ | 8 | header-y += bootsetup.h |
| 9 | vsyscall32.h | 9 | header-y += cpufeature.h |
| 10 | header-y += debugreg.h | ||
| 11 | header-y += ldt.h | ||
| 12 | header-y += msr.h | ||
| 13 | header-y += prctl.h | ||
| 14 | header-y += setup.h | ||
| 15 | header-y += sigcontext32.h | ||
| 16 | header-y += ucontext.h | ||
| 17 | header-y += vsyscall32.h | ||
| 10 | 18 | ||
| 11 | unifdef-y += mce.h mtrr.h vsyscall.h | 19 | unifdef-y += mce.h |
| 20 | unifdef-y += mtrr.h | ||
| 21 | unifdef-y += vsyscall.h | ||