From: Roland Dreier <roland@digitalvampire.org>
Date: Mon, 15 Oct 2007 11:57:46 +0000 (+0200)
Subject: x86: merge some trivially mergeable headers
X-Git-Tag: v2.6.24-rc1~476^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=217d115cd5d7d2bef7db7839b93ce5dc2867c392;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed