git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 01749f6)
x86: unify include/asm/types_32/64.h
authorThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Wed, 17 Oct 2007 18:32:07 +0000 (20:32 +0200)
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Wed, 17 Oct 2007 18:32:07 +0000 (20:32 +0200)
Mostly the same. Make the few exceptions conditional.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Conflicts:

include/asm-x86/types_32.h

include/asm-x86/Kbuild patch | blob | history
include/asm-x86/types.h patch | blob | history
include/asm-x86/types_32.h [deleted file] patch | blob | history
include/asm-x86/types_64.h [deleted file] patch | blob | history

diff --cc include/asm-x86/Kbuild
Simple merge
diff --cc include/asm-x86/types.h
Simple merge
diff --cc include/asm-x86/types_32.h
Simple merge
diff --cc include/asm-x86/types_64.h
Simple merge
Pandora Kernel Repository