diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/hd.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/i8253.c | 2 | ||||
-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 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/hd.c b/drivers/block/hd.c index 007c630904c1..b52c9ca146fc 100644 --- a/drivers/block/hd.c +++ b/drivers/block/hd.c | |||
@@ -155,7 +155,7 @@ else \ | |||
155 | 155 | ||
156 | #if (HD_DELAY > 0) | 156 | #if (HD_DELAY > 0) |
157 | 157 | ||
158 | #include <asm/i8253.h> | 158 | #include <linux/i8253.h> |
159 | 159 | ||
160 | unsigned long last_req; | 160 | unsigned long last_req; |
161 | 161 | ||
diff --git a/drivers/clocksource/i8253.c b/drivers/clocksource/i8253.c index 225c1761b372..33735ebd2dcc 100644 --- a/drivers/clocksource/i8253.c +++ b/drivers/clocksource/i8253.c | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <linux/spinlock.h> | 7 | #include <linux/spinlock.h> |
8 | #include <linux/timex.h> | 8 | #include <linux/timex.h> |
9 | 9 | ||
10 | #include <asm/i8253.h> | 10 | #include <linux/i8253.h> |
11 | 11 | ||
12 | /* | 12 | /* |
13 | * Since the PIT overflows every tick, its not very useful | 13 | * Since the PIT overflows every tick, its not very useful |
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); |