diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-01 14:04:57 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-09 09:01:37 -0400 |
commit | 334955ef964bee9d3b1e20966847eee28cfd05f6 (patch) | |
tree | e0c35313ce6d82e94768f0c5d78c53ec296392a2 /drivers/input | |
parent | 06e86849cf4019945a106913adb9ff0abcc01770 (diff) |
i8253: Create linux/i8253.h and use it in all 8253 related files
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Link: http://lkml.kernel.org/r/20110601180610.054254048@duck.linux-mips.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/arm/mach-footbridge/isa-timer.c | 2 +-
arch/mips/cobalt/time.c | 2 +-
arch/mips/jazz/irq.c | 2 +-
arch/mips/kernel/i8253.c | 2 +-
arch/mips/mti-malta/malta-time.c | 2 +-
arch/mips/sgi-ip22/ip22-time.c | 2 +-
arch/mips/sni/time.c | 2 +-
arch/x86/kernel/apic/apic.c | 2 +-
arch/x86/kernel/apm_32.c | 2 +-
arch/x86/kernel/hpet.c | 2 +-
arch/x86/kernel/i8253.c | 2 +-
arch/x86/kernel/time.c | 2 +-
drivers/block/hd.c | 2 +-
drivers/clocksource/i8253.c | 2 +-
drivers/input/gameport/gameport.c | 2 +-
drivers/input/joystick/analog.c | 2 +-
drivers/input/misc/pcspkr.c | 2 +-
include/linux/i8253.h | 11 +++++++++++
sound/drivers/pcsp/pcsp.h | 2 +-
19 files changed, 29 insertions(+), 18 deletions(-)
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/gameport/gameport.c | 2 | ||||
-rw-r--r-- | drivers/input/joystick/analog.c | 2 | ||||
-rw-r--r-- | drivers/input/misc/pcspkr.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c index 5b8f59d6c3e8..c351aa421f8f 100644 --- a/drivers/input/gameport/gameport.c +++ b/drivers/input/gameport/gameport.c | |||
@@ -47,7 +47,7 @@ static void gameport_disconnect_port(struct gameport *gameport); | |||
47 | 47 | ||
48 | #if defined(__i386__) | 48 | #if defined(__i386__) |
49 | 49 | ||
50 | #include <asm/i8253.h> | 50 | #include <linux/i8253.h> |
51 | 51 | ||
52 | #define DELTA(x,y) ((y)-(x)+((y)<(x)?1193182/HZ:0)) | 52 | #define DELTA(x,y) ((y)-(x)+((y)<(x)?1193182/HZ:0)) |
53 | #define GET_TIME(x) do { x = get_time_pit(); } while (0) | 53 | #define GET_TIME(x) do { x = get_time_pit(); } while (0) |
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 4afe0a3b4884..9882971827e6 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c | |||
@@ -136,7 +136,7 @@ struct analog_port { | |||
136 | 136 | ||
137 | #ifdef __i386__ | 137 | #ifdef __i386__ |
138 | 138 | ||
139 | #include <asm/i8253.h> | 139 | #include <linux/i8253.h> |
140 | 140 | ||
141 | #define GET_TIME(x) do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0) | 141 | #define GET_TIME(x) do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0) |
142 | #define DELTA(x,y) (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? CLOCK_TICK_RATE / HZ : 0))) | 142 | #define DELTA(x,y) (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? CLOCK_TICK_RATE / HZ : 0))) |
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c index f080dd31499b..2aa9d9020179 100644 --- a/drivers/input/misc/pcspkr.c +++ b/drivers/input/misc/pcspkr.c | |||
@@ -27,7 +27,7 @@ MODULE_ALIAS("platform:pcspkr"); | |||
27 | 27 | ||
28 | #if defined(CONFIG_MIPS) || defined(CONFIG_X86) | 28 | #if defined(CONFIG_MIPS) || defined(CONFIG_X86) |
29 | /* Use the global PIT lock ! */ | 29 | /* Use the global PIT lock ! */ |
30 | #include <asm/i8253.h> | 30 | #include <linux/i8253.h> |
31 | #else | 31 | #else |
32 | #include <asm/8253pit.h> | 32 | #include <asm/8253pit.h> |
33 | static DEFINE_RAW_SPINLOCK(i8253_lock); | 33 | static DEFINE_RAW_SPINLOCK(i8253_lock); |