]> err.no Git - linux-2.6/commit
x86: merge acpi_32/64.h
authorThomas Gleixner <tglx@linutronix.de>
Wed, 30 Jan 2008 12:30:36 +0000 (13:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:30:36 +0000 (13:30 +0100)
commit0b80fc721bed2635c7f0b198e1c862a4596dc2cd
treefa3a3a637be8ddcc371fde1d65b961f4103bfd9f
parent8a999410135602d98bd007e835dc21c0c279ad72
x86: merge acpi_32/64.h

Merge the files.

[ mingo@elte.hu: build fix ]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/asm-x86/acpi.h
include/asm-x86/acpi_32.h [deleted file]
include/asm-x86/acpi_64.h [deleted file]