x86: unify asm/cpufeature.h
authorH. Peter Anvin <hpa@zytor.com>
Wed, 30 Jan 2008 12:30:07 +0000 (13:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:30:07 +0000 (13:30 +0100)
asm/cpufeature.h was already almost unified; this completes the job.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/asm-x86/cpufeature.h
include/asm-x86/cpufeature_32.h [deleted file]
include/asm-x86/cpufeature_64.h [deleted file]

Simple merge
diff --cc include/asm-x86/cpufeature_32.h
Simple merge
diff --cc include/asm-x86/cpufeature_64.h
Simple merge