diff options
| author | Roland Dreier <roland@digitalvampire.org> | 2007-10-15 07:57:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:17:09 -0400 |
| commit | 217d115cd5d7d2bef7db7839b93ce5dc2867c392 (patch) | |
| tree | 1f3ba24177455aeadcf065b9157ccac9252c7cfc /include/asm-x86/Kbuild | |
| parent | 020bd9f1c766ca743556461a70a5b5d559b7e60c (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>
Diffstat (limited to 'include/asm-x86/Kbuild')
| -rw-r--r-- | include/asm-x86/Kbuild | 2 |
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 | |||
| 59 | unifdef-y += siginfo_64.h | 59 | unifdef-y += siginfo_64.h |
| 60 | unifdef-y += signal_32.h | 60 | unifdef-y += signal_32.h |
| 61 | unifdef-y += signal_64.h | 61 | unifdef-y += signal_64.h |
| 62 | unifdef-y += sockios_32.h | ||
| 63 | unifdef-y += sockios_64.h | ||
| 64 | unifdef-y += stat_32.h | 62 | unifdef-y += stat_32.h |
| 65 | unifdef-y += stat_64.h | 63 | unifdef-y += stat_64.h |
| 66 | unifdef-y += statfs_32.h | 64 | unifdef-y += statfs_32.h |