summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/Kbuild
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-19 00:42:13 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-19 00:42:13 -0400
commit4a3381feb823e06c8e2da7e283c17b0b6fdbddcf (patch)
treee1bef4c3db854bb10fd13dc67415d77b5d999533 /include/asm-i386/Kbuild
parentfea63e38013ec628ab3f7fddc4c2148064b7910a (diff)
parent47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff)
downloadop-kernel-dev-4a3381feb823e06c8e2da7e283c17b0b6fdbddcf.zip
op-kernel-dev-4a3381feb823e06c8e2da7e283c17b0b6fdbddcf.tar.gz
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-i386/Kbuild')
-rw-r--r--include/asm-i386/Kbuild4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
index 335b2fa..2308190 100644
--- a/include/asm-i386/Kbuild
+++ b/include/asm-i386/Kbuild
@@ -1,5 +1,5 @@
include include/asm-generic/Kbuild.asm
-header-y += boot.h debugreg.h ldt.h setup.h ucontext.h
+header-y += boot.h debugreg.h ldt.h ucontext.h
-unifdef-y += mtrr.h vm86.h
+unifdef-y += mtrr.h setup.h vm86.h
OpenPOWER on IntegriCloud