Commit 5d5a2989 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
parent fb79d22e
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <asm/8253pit.h>
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <asm/8253pit.h>
#include <asm/io.h> #include <asm/io.h>
MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
...@@ -28,6 +27,7 @@ MODULE_LICENSE("GPL"); ...@@ -28,6 +27,7 @@ MODULE_LICENSE("GPL");
/* Use the global PIT lock ! */ /* Use the global PIT lock ! */
#include <asm/i8253.h> #include <asm/i8253.h>
#else #else
#include <asm/8253pit.h>
static DEFINE_SPINLOCK(i8253_lock); static DEFINE_SPINLOCK(i8253_lock);
#endif #endif
......
#ifdef CONFIG_X86_32
# include "8253pit_32.h"
#else
# include "8253pit_64.h"
#endif
/*
* 8253/8254 Programmable Interval Timer
*/
#ifndef _8253PIT_H
#define _8253PIT_H
#include <asm/timex.h>
#define PIT_TICK_RATE CLOCK_TICK_RATE
#endif
/*
* 8253/8254 Programmable Interval Timer
*/
#ifndef _8253PIT_H
#define _8253PIT_H
#define PIT_TICK_RATE 1193182UL
#endif
#ifndef __ASM_I8253_H__ #ifndef __ASM_I8253_H__
#define __ASM_I8253_H__ #define __ASM_I8253_H__
#ifdef CONFIG_X86_64
# include <asm/8253pit.h>
#endif
/* i8253A PIT registers */ /* i8253A PIT registers */
#define PIT_MODE 0x43 #define PIT_MODE 0x43
#define PIT_CH0 0x40 #define PIT_CH0 0x40
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#include <asm/tsc.h> #include <asm/tsc.h>
#ifdef CONFIG_X86_ELAN #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 #else
# define CLOCK_TICK_RATE 1193182 /* Underlying HZ */ # define PIT_TICK_RATE 1193182 /* Underlying HZ */
#endif #endif
#define CLOCK_TICK_RATE PIT_TICK_RATE
extern int read_current_timer(unsigned long *timer_value); extern int read_current_timer(unsigned long *timer_value);
#define ARCH_HAS_READ_CURRENT_TIMER 1 #define ARCH_HAS_READ_CURRENT_TIMER 1
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#ifndef _ASMx8664_TIMEX_H #ifndef _ASMx8664_TIMEX_H
#define _ASMx8664_TIMEX_H #define _ASMx8664_TIMEX_H
#include <asm/8253pit.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/vsyscall.h> #include <asm/vsyscall.h>
#include <asm/system.h> #include <asm/system.h>
...@@ -14,6 +13,7 @@ ...@@ -14,6 +13,7 @@
#include <asm/tsc.h> #include <asm/tsc.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#define PIT_TICK_RATE 1193182UL
#define CLOCK_TICK_RATE PIT_TICK_RATE /* Underlying HZ */ #define CLOCK_TICK_RATE PIT_TICK_RATE /* Underlying HZ */
extern int read_current_timer(unsigned long *timer_value); extern int read_current_timer(unsigned long *timer_value);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment