diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 12:56:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 12:56:22 -0700 |
commit | e6e5fee1426bef07f4e6c3c76f48343c14207938 (patch) | |
tree | 28f4ca26cf85e0971e9bb4927c439b36c2b93f51 /include/asm-i386/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-i386/Kbuild')
-rw-r--r-- | include/asm-i386/Kbuild | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild index 2308190321d..b75a348d0c1 100644 --- a/include/asm-i386/Kbuild +++ b/include/asm-i386/Kbuild @@ -1,5 +1,10 @@ include include/asm-generic/Kbuild.asm -header-y += boot.h debugreg.h ldt.h ucontext.h +header-y += boot.h +header-y += debugreg.h +header-y += ldt.h +header-y += ucontext.h -unifdef-y += mtrr.h setup.h vm86.h +unifdef-y += mtrr.h +unifdef-y += setup.h +unifdef-y += vm86.h |