Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[~andy/linux] / include / asm-i386 / Kbuild

diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
index b75a348d0c1cfdb7cde4c0fe6adc05846e0fc2c4..5ae93afc67e1f019d6ce6d902ccac733a18a79fb 100644 (file)
--- a/include/asm-i386/Kbuild
+++ b/include/asm-i386/Kbuild
@@ -3,8 +3,8 @@ include include/asm-generic/Kbuild.asm
 header-y += boot.h
 header-y += debugreg.h
 header-y += ldt.h
+header-y += ptrace-abi.h
 header-y += ucontext.h
 
 unifdef-y += mtrr.h
-unifdef-y += setup.h
 unifdef-y += vm86.h