]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 020bd9f) | patch
x86: merge some trivially mergeable headers
authorRoland Dreier <roland@digitalvampire.org>
Mon, 15 Oct 2007 11:57:46 +0000 (13:57 +0200)
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Wed, 17 Oct 2007 18:17:09 +0000 (20:17 +0200)
commit217d115cd5d7d2bef7db7839b93ce5dc2867c392
tree1f3ba24177455aeadcf065b9157ccac9252c7cfctree | snapshot
parent020bd9f1c766ca743556461a70a5b5d559b7e60ccommit | diff
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>
include/asm-x86/Kbuild diff | blob | history
include/asm-x86/serial.h diff | blob | history
include/asm-x86/serial_32.h [deleted file] blob | history
include/asm-x86/serial_64.h [deleted file] blob | history
include/asm-x86/sockios.h diff | blob | history
include/asm-x86/sockios_32.h [deleted file] blob | history
include/asm-x86/sockios_64.h [deleted file] blob | history
Linux 2.6 source tree