From 4ff4bf5b6bd33691b438c62bb1f51acda7e27113 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 1 Jun 2011 19:05:07 +0100 Subject: [PATCH] --- yaml --- r: 257190 b: refs/heads/master c: 49cf3f29a1ef2e59f1be823e376c1fbac586eb8d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/i8253.h | 2 -- trunk/arch/mips/include/asm/i8253.h | 2 -- trunk/arch/x86/include/asm/i8253.h | 2 -- trunk/include/linux/i8253.h | 4 ++++ 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 303f4b829bdb..9b8b37d1bcfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16f871bc30f86560017b9d34520593a28e08f373 +refs/heads/master: 49cf3f29a1ef2e59f1be823e376c1fbac586eb8d diff --git a/trunk/arch/arm/include/asm/i8253.h b/trunk/arch/arm/include/asm/i8253.h index 5b41b92ecf6a..fee59eb4581d 100644 --- a/trunk/arch/arm/include/asm/i8253.h +++ b/trunk/arch/arm/include/asm/i8253.h @@ -1,6 +1,4 @@ #ifndef __ASMARM_I8253_H #define __ASMARM_I8253_H -#define PIT_LATCH ((PIT_TICK_RATE + HZ / 2) / HZ) - #endif diff --git a/trunk/arch/mips/include/asm/i8253.h b/trunk/arch/mips/include/asm/i8253.h index 32ec1f00c6b3..26f4eb197c3a 100644 --- a/trunk/arch/mips/include/asm/i8253.h +++ b/trunk/arch/mips/include/asm/i8253.h @@ -5,8 +5,6 @@ #ifndef __ASM_I8253_H #define __ASM_I8253_H -#define PIT_LATCH LATCH - extern void setup_pit_timer(void); #endif /* __ASM_I8253_H */ diff --git a/trunk/arch/x86/include/asm/i8253.h b/trunk/arch/x86/include/asm/i8253.h index 3d5f5eea5da4..0049dc9fbfee 100644 --- a/trunk/arch/x86/include/asm/i8253.h +++ b/trunk/arch/x86/include/asm/i8253.h @@ -1,8 +1,6 @@ #ifndef _ASM_X86_I8253_H #define _ASM_X86_I8253_H -#define PIT_LATCH LATCH - extern void setup_pit_timer(void); #endif /* _ASM_X86_I8253_H */ diff --git a/trunk/include/linux/i8253.h b/trunk/include/linux/i8253.h index 13048d335368..1ec6323a1507 100644 --- a/trunk/include/linux/i8253.h +++ b/trunk/include/linux/i8253.h @@ -9,7 +9,9 @@ #ifndef __LINUX_I8253_H #define __LINUX_I8253_H +#include #include +#include #include /* i8253A PIT registers */ @@ -17,6 +19,8 @@ #define PIT_CH0 0x40 #define PIT_CH2 0x42 +#define PIT_LATCH ((PIT_TICK_RATE + HZ/2) / HZ) + #define inb_pit inb_p #define outb_pit outb_p