diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-21 15:10:16 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-22 01:37:09 (GMT) |
commit | 0655d7c32bd21685a58fc4636f378d086396eb68 (patch) | |
tree | 57e156a53c6a853bdad840a85b56a0bea728d8aa /arch/i386 | |
parent | aec8148fda5686b671fbbd9ffd6f432a1f80ee3c (diff) | |
download | linux-fsl-qoriq-0655d7c32bd21685a58fc4636f378d086396eb68.tar.xz |
x86: share hpet.h with i386
hpet.h in asm-i386 and asm-x86_64 contain tons of duplicated stuff.
Consolidate into one shared header file.
AK: Fix i386 compilation with !X86_IO_APIC
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/hpet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c index cfbf792..662d797 100644 --- a/arch/i386/kernel/hpet.c +++ b/arch/i386/kernel/hpet.c @@ -5,6 +5,7 @@ #include <linux/init.h> #include <linux/sysdev.h> #include <linux/pm.h> +#include <linux/delay.h> #include <asm/hpet.h> #include <asm/io.h> |