diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /include/asm-i386 | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-i386')
| -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 2308190321da..b75a348d0c1c 100644 --- a/include/asm-i386/Kbuild +++ b/include/asm-i386/Kbuild | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
| 2 | 2 | ||
| 3 | header-y += boot.h debugreg.h ldt.h ucontext.h | 3 | header-y += boot.h |
| 4 | header-y += debugreg.h | ||
| 5 | header-y += ldt.h | ||
| 6 | header-y += ucontext.h | ||
| 4 | 7 | ||
| 5 | unifdef-y += mtrr.h setup.h vm86.h | 8 | unifdef-y += mtrr.h |
| 9 | unifdef-y += setup.h | ||
| 10 | unifdef-y += vm86.h | ||