summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2011-06-01 19:05:08 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-06-09 15:01:40 +0200
commit850492760cfd38d14d64a5fc6d636091464f755e (patch)
tree4119e8b13677a71084a23a30bd99812388b28af3
parent49cf3f29a1ef2e59f1be823e376c1fbac586eb8d (diff)
downloadop-kernel-dev-850492760cfd38d14d64a5fc6d636091464f755e.zip
op-kernel-dev-850492760cfd38d14d64a5fc6d636091464f755e.tar.gz
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.h4
-rw-r--r--arch/mips/include/asm/i8253.h10
-rw-r--r--arch/x86/include/asm/i8253.h6
-rw-r--r--include/linux/i8253.h3
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 fee59eb..0000000
--- a/arch/arm/include/asm/i8253.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASMARM_I8253_H
-#define __ASMARM_I8253_H
-
-#endif
diff --git a/arch/mips/include/asm/i8253.h b/arch/mips/include/asm/i8253.h
deleted file mode 100644
index 26f4eb1..0000000
--- a/arch/mips/include/asm/i8253.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Machine specific IO port address definition for generic.
- * Written by Osamu Tomita <tomita@cinet.co.jp>
- */
-#ifndef __ASM_I8253_H
-#define __ASM_I8253_H
-
-extern void setup_pit_timer(void);
-
-#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 0049dc9..0000000
--- a/arch/x86/include/asm/i8253.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_X86_I8253_H
-#define _ASM_X86_I8253_H
-
-extern void setup_pit_timer(void);
-
-#endif /* _ASM_X86_I8253_H */
diff --git a/include/linux/i8253.h b/include/linux/i8253.h
index 1ec6323..76039c8 100644
--- a/include/linux/i8253.h
+++ b/include/linux/i8253.h
@@ -12,7 +12,6 @@
#include <linux/param.h>
#include <linux/spinlock.h>
#include <linux/timex.h>
-#include <asm/i8253.h>
/* i8253A PIT registers */
#define PIT_MODE 0x43
@@ -26,4 +25,6 @@
extern raw_spinlock_t i8253_lock;
+extern void setup_pit_timer(void);
+
#endif /* __LINUX_I8253_H */
OpenPOWER on IntegriCloud