Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6] / include / asm-x86 / i8253.h

diff --git a/include/asm-x86/i8253.h b/include/asm-x86/i8253.h
index 7eff6fd27474bcb60c5971c29f00bd9f2372f759..b51c0487fc41d6aec43c7db474e80abd0330d50d 100644 (file)
--- a/include/asm-x86/i8253.h
+++ b/include/asm-x86/i8253.h
@@ -1,10 +1,6 @@
 #ifndef __ASM_I8253_H__
 #define __ASM_I8253_H__
 
-#ifdef CONFIG_X86_64
-# include <asm/8253pit.h>
-#endif
-
 /* i8253A PIT registers */
 #define PIT_MODE               0x43
 #define PIT_CH0                        0x40
@@ -12,12 +8,11 @@
 
 extern spinlock_t i8253_lock;
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
-
 extern struct clock_event_device *global_clock_event;
 
 extern void setup_pit_timer(void);
 
-#endif
+#define inb_pit                inb_p
+#define outb_pit       outb_p
 
 #endif /* __ASM_I8253_H__ */