diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
| commit | 803db244b9f71102e366fd689000c1417b9a7508 (patch) | |
| tree | 2fe1abfd16cded8074905b6b91d9d1943e15325e /include/asm-i386/Kbuild | |
| parent | 8b98a37c4b00f3fbcf162281bd4595777e61241b (diff) | |
| parent | f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-i386/Kbuild')
| -rw-r--r-- | include/asm-i386/Kbuild | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild index 335b2fa4e066..2308190321da 100644 --- a/include/asm-i386/Kbuild +++ b/include/asm-i386/Kbuild | |||
| @@ -1,5 +1,5 @@ | |||
| 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 setup.h ucontext.h | 3 | header-y += boot.h debugreg.h ldt.h ucontext.h |
| 4 | 4 | ||
| 5 | unifdef-y += mtrr.h vm86.h | 5 | unifdef-y += mtrr.h setup.h vm86.h |