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-alpha/Kbuild | |
| 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-alpha/Kbuild')
| -rw-r--r-- | include/asm-alpha/Kbuild | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-alpha/Kbuild b/include/asm-alpha/Kbuild index 2b06b3bad5ff..b7c8f188b313 100644 --- a/include/asm-alpha/Kbuild +++ b/include/asm-alpha/Kbuild | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | unifdef-y += console.h fpu.h sysinfo.h compiler.h | 3 | header-y += gentrap.h |
| 4 | header-y += regdef.h | ||
| 5 | header-y += pal.h | ||
| 6 | header-y += reg.h | ||
| 4 | 7 | ||
| 5 | header-y += gentrap.h regdef.h pal.h reg.h | 8 | unifdef-y += console.h |
| 9 | unifdef-y += fpu.h | ||
| 10 | unifdef-y += sysinfo.h | ||
| 11 | unifdef-y += compiler.h | ||