aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/Kbuild
diff options
context:
space:
mode:
authorRoland Dreier <roland@digitalvampire.org>2007-10-15 13:57:46 +0200
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-17 20:17:09 +0200
commit217d115cd5d7d2bef7db7839b93ce5dc2867c392 (patch)
tree1f3ba24177455aeadcf065b9157ccac9252c7cfc /include/asm-x86/Kbuild
parentx86: trivial header merges (diff)
downloadlinux-dev-217d115cd5d7d2bef7db7839b93ce5dc2867c392.tar.xz
linux-dev-217d115cd5d7d2bef7db7839b93ce5dc2867c392.zip
x86: merge some trivially mergeable headers
Merge errno.h, resource.h, rtc.h, sections.h, serial.h and sockios.h, where i386 and x86_64 have no or only trivial comment/include guard differences. Build tested on both 32-bit and 64-bit, and booted on 64-bit. [tglx: fixup Kbuild as well] Signed-off-by: Roland Dreier <roland@digitalvampire.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/Kbuild')
-rw-r--r--include/asm-x86/Kbuild2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
index 0618ca386ab1..158deea39a54 100644
--- a/include/asm-x86/Kbuild
+++ b/include/asm-x86/Kbuild
@@ -59,8 +59,6 @@ unifdef-y += siginfo_32.h
unifdef-y += siginfo_64.h
unifdef-y += signal_32.h
unifdef-y += signal_64.h
-unifdef-y += sockios_32.h
-unifdef-y += sockios_64.h
unifdef-y += stat_32.h
unifdef-y += stat_64.h
unifdef-y += statfs_32.h