---

yaml --- r: 67764 b: refs/heads/master c: 5d5a298 h: refs/heads/master v: v3
git-mirror · Oct 12, 2007 · 9341e2b · 9341e2b
1 parent ba5c0dd
commit 9341e2b
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 38 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb79d22e1d4b06385796cc0db0084a2e07beccee
+refs/heads/master: 5d5a2989b72847e1f5763420ea31383ca63ebf53
diff --git a/trunk/arch/x86/kernel/i8259_32.c b/trunk/arch/x86/kernel/i8259_32.c
@@ -10,7 +10,6 @@
 #include <linux/sysdev.h>
 #include <linux/bitops.h>
 
-#include <asm/8253pit.h>
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>

diff --git a/trunk/drivers/input/misc/pcspkr.c b/trunk/drivers/input/misc/pcspkr.c
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
-#include <asm/8253pit.h>
 #include <asm/io.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
@@ -28,6 +27,7 @@ MODULE_LICENSE("GPL");
 /* Use the global PIT lock ! */
 #include <asm/i8253.h>
 #else
+#include <asm/8253pit.h>
 static DEFINE_SPINLOCK(i8253_lock);
 #endif
 

diff --git a/trunk/include/asm-x86/8253pit.h b/trunk/include/asm-x86/8253pit.h
diff --git a/trunk/include/asm-x86/8253pit_32.h b/trunk/include/asm-x86/8253pit_32.h
diff --git a/trunk/include/asm-x86/8253pit_64.h b/trunk/include/asm-x86/8253pit_64.h
diff --git a/trunk/include/asm-x86/i8253.h b/trunk/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

diff --git a/trunk/include/asm-x86/timex_32.h b/trunk/include/asm-x86/timex_32.h
@@ -10,11 +10,11 @@
 #include <asm/tsc.h>
 
 #ifdef CONFIG_X86_ELAN
-#  define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */
+#  define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */
 #else
-#  define CLOCK_TICK_RATE 1193182 /* Underlying HZ */
+#  define PIT_TICK_RATE 1193182 /* Underlying HZ */
 #endif
-
+#define CLOCK_TICK_RATE	PIT_TICK_RATE
 
 extern int read_current_timer(unsigned long *timer_value);
 #define ARCH_HAS_READ_CURRENT_TIMER	1

diff --git a/trunk/include/asm-x86/timex_64.h b/trunk/include/asm-x86/timex_64.h
@@ -6,14 +6,14 @@
 #ifndef _ASMx8664_TIMEX_H
 #define _ASMx8664_TIMEX_H
 
-#include <asm/8253pit.h>
 #include <asm/msr.h>
 #include <asm/vsyscall.h>
 #include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/tsc.h>
 #include <linux/compiler.h>
 
+#define PIT_TICK_RATE	1193182UL
 #define CLOCK_TICK_RATE	PIT_TICK_RATE	/* Underlying HZ */
 
 extern int read_current_timer(unsigned long *timer_value);