aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-12 23:04:23 +0200
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-12 23:04:23 +0200
commit5d5a2989b72847e1f5763420ea31383ca63ebf53 (patch)
tree8eacc41a879de2a1d72699e1a15f2e0d2f612650 /include/asm-x86
parentfb79d22e1d4b06385796cc0db0084a2e07beccee (diff)
x86: kill 8253pit.h
Useless header file with 32 bit and 64 bit variants. Move the single useful line to the place where it is used. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/8253pit.h5
-rw-r--r--include/asm-x86/8253pit_32.h12
-rw-r--r--include/asm-x86/8253pit_64.h10
-rw-r--r--include/asm-x86/i8253.h4
-rw-r--r--include/asm-x86/timex_32.h6
-rw-r--r--include/asm-x86/timex_64.h2
6 files changed, 4 insertions, 35 deletions
diff --git a/include/asm-x86/8253pit.h b/include/asm-x86/8253pit.h
deleted file mode 100644
index d3c2b38a661..00000000000
--- a/include/asm-x86/8253pit.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef CONFIG_X86_32
-# include "8253pit_32.h"
-#else
-# include "8253pit_64.h"
-#endif
diff --git a/include/asm-x86/8253pit_32.h b/include/asm-x86/8253pit_32.h
deleted file mode 100644
index 96c7c3592da..00000000000
--- a/include/asm-x86/8253pit_32.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * 8253/8254 Programmable Interval Timer
- */
-
-#ifndef _8253PIT_H
-#define _8253PIT_H
-
-#include <asm/timex.h>
-
-#define PIT_TICK_RATE CLOCK_TICK_RATE
-
-#endif
diff --git a/include/asm-x86/8253pit_64.h b/include/asm-x86/8253pit_64.h
deleted file mode 100644
index 285f78488cc..00000000000
--- a/include/asm-x86/8253pit_64.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * 8253/8254 Programmable Interval Timer
- */
-
-#ifndef _8253PIT_H
-#define _8253PIT_H
-
-#define PIT_TICK_RATE 1193182UL
-
-#endif
diff --git a/include/asm-x86/i8253.h b/include/asm-x86/i8253.h
index 7eff6fd2747..28cf67da59a 100644
--- 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
diff --git a/include/asm-x86/timex_32.h b/include/asm-x86/timex_32.h
index 3666044409f..fa8839465bd 100644
--- a/include/asm-x86/timex_32.h
+++ b/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/include/asm-x86/timex_64.h b/include/asm-x86/timex_64.h
index 6ed21f44d30..901bf89ce64 100644
--- a/include/asm-x86/timex_64.h
+++ b/include/asm-x86/timex_64.h
@@ -6,7 +6,6 @@
#ifndef _ASMx8664_TIMEX_H
#define _ASMx8664_TIMEX_H
-#include <asm/8253pit.h>
#include <asm/msr.h>
#include <asm/vsyscall.h>
#include <asm/system.h>
@@ -14,6 +13,7 @@
#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);