diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-01 14:05:08 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-09 09:01:40 -0400 |
| commit | 850492760cfd38d14d64a5fc6d636091464f755e (patch) | |
| tree | 4119e8b13677a71084a23a30bd99812388b28af3 | |
| parent | 49cf3f29a1ef2e59f1be823e376c1fbac586eb8d (diff) | |
i8253: Move remaining content and delete asm/i8253.h
Move setup_pit_timer() declaration to the common header file and
remove the arch specific ones.
[ tglx: Move it to linux/i8253.h instead of asm/mips and asm/x86 ]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-mips@linux-mips.org
Cc: Sergei Shtylyov <sshtylyov@mvista.com
Link: http://lkml.kernel.org/r/20110601180610.913463093@duck.linux-mips.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/arm/include/asm/i8253.h | 4 | ||||
| -rw-r--r-- | arch/mips/include/asm/i8253.h | 10 | ||||
| -rw-r--r-- | arch/x86/include/asm/i8253.h | 6 | ||||
| -rw-r--r-- | include/linux/i8253.h | 3 |
4 files changed, 2 insertions, 21 deletions
diff --git a/arch/arm/include/asm/i8253.h b/arch/arm/include/asm/i8253.h deleted file mode 100644 index fee59eb4581d..000000000000 --- a/arch/arm/include/asm/i8253.h +++ /dev/null | |||
| @@ -1,4 +0,0 @@ | |||
| 1 | #ifndef __ASMARM_I8253_H | ||
| 2 | #define __ASMARM_I8253_H | ||
| 3 | |||
| 4 | #endif | ||
diff --git a/arch/mips/include/asm/i8253.h b/arch/mips/include/asm/i8253.h deleted file mode 100644 index 26f4eb197c3a..000000000000 --- a/arch/mips/include/asm/i8253.h +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Machine specific IO port address definition for generic. | ||
| 3 | * Written by Osamu Tomita <tomita@cinet.co.jp> | ||
| 4 | */ | ||
| 5 | #ifndef __ASM_I8253_H | ||
| 6 | #define __ASM_I8253_H | ||
| 7 | |||
| 8 | extern void setup_pit_timer(void); | ||
| 9 | |||
| 10 | #endif /* __ASM_I8253_H */ | ||
diff --git a/arch/x86/include/asm/i8253.h b/arch/x86/include/asm/i8253.h deleted file mode 100644 index 0049dc9fbfee..000000000000 --- a/arch/x86/include/asm/i8253.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef _ASM_X86_I8253_H | ||
| 2 | #define _ASM_X86_I8253_H | ||
| 3 | |||
| 4 | extern void setup_pit_timer(void); | ||
| 5 | |||
| 6 | #endif /* _ASM_X86_I8253_H */ | ||
diff --git a/include/linux/i8253.h b/include/linux/i8253.h index 1ec6323a1507..76039c86ab58 100644 --- a/include/linux/i8253.h +++ b/include/linux/i8253.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/param.h> | 12 | #include <linux/param.h> |
| 13 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
| 14 | #include <linux/timex.h> | 14 | #include <linux/timex.h> |
| 15 | #include <asm/i8253.h> | ||
| 16 | 15 | ||
| 17 | /* i8253A PIT registers */ | 16 | /* i8253A PIT registers */ |
| 18 | #define PIT_MODE 0x43 | 17 | #define PIT_MODE 0x43 |
| @@ -26,4 +25,6 @@ | |||
| 26 | 25 | ||
| 27 | extern raw_spinlock_t i8253_lock; | 26 | extern raw_spinlock_t i8253_lock; |
| 28 | 27 | ||
| 28 | extern void setup_pit_timer(void); | ||
| 29 | |||
| 29 | #endif /* __LINUX_I8253_H */ | 30 | #endif /* __LINUX_I8253_H */ |