diff options
-rw-r--r-- | arch/mips/kernel/i8253.c | 2 | ||||
-rw-r--r-- | drivers/input/misc/pcspkr.c | 2 | ||||
-rw-r--r-- | include/asm-mips/i8253.h | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c index a925abd8d29e..c2d497ceffdd 100644 --- a/arch/mips/kernel/i8253.c +++ b/arch/mips/kernel/i8253.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <asm/io.h> | 14 | #include <asm/io.h> |
15 | #include <asm/time.h> | 15 | #include <asm/time.h> |
16 | 16 | ||
17 | static DEFINE_SPINLOCK(i8253_lock); | 17 | DEFINE_SPINLOCK(i8253_lock); |
18 | 18 | ||
19 | /* | 19 | /* |
20 | * Initialize the PIT timer. | 20 | * Initialize the PIT timer. |
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c index 4941a9e61e90..43aaa5cebd12 100644 --- a/drivers/input/misc/pcspkr.c +++ b/drivers/input/misc/pcspkr.c | |||
@@ -24,7 +24,7 @@ MODULE_DESCRIPTION("PC Speaker beeper driver"); | |||
24 | MODULE_LICENSE("GPL"); | 24 | MODULE_LICENSE("GPL"); |
25 | MODULE_ALIAS("platform:pcspkr"); | 25 | MODULE_ALIAS("platform:pcspkr"); |
26 | 26 | ||
27 | #ifdef CONFIG_X86 | 27 | #if defined(CONFIG_MIPS) || defined(CONFIG_X86) |
28 | /* Use the global PIT lock ! */ | 28 | /* Use the global PIT lock ! */ |
29 | #include <asm/i8253.h> | 29 | #include <asm/i8253.h> |
30 | #else | 30 | #else |
diff --git a/include/asm-mips/i8253.h b/include/asm-mips/i8253.h index 778b2f023905..032ca73f181b 100644 --- a/include/asm-mips/i8253.h +++ b/include/asm-mips/i8253.h | |||
@@ -5,11 +5,15 @@ | |||
5 | #ifndef __ASM_I8253_H | 5 | #ifndef __ASM_I8253_H |
6 | #define __ASM_I8253_H | 6 | #define __ASM_I8253_H |
7 | 7 | ||
8 | #include <linux/spinlock.h> | ||
9 | |||
8 | /* i8253A PIT registers */ | 10 | /* i8253A PIT registers */ |
9 | #define PIT_MODE 0x43 | 11 | #define PIT_MODE 0x43 |
10 | #define PIT_CH0 0x40 | 12 | #define PIT_CH0 0x40 |
11 | #define PIT_CH2 0x42 | 13 | #define PIT_CH2 0x42 |
12 | 14 | ||
15 | extern spinlock_t i8253_lock; | ||
16 | |||
13 | extern void setup_pit_timer(void); | 17 | extern void setup_pit_timer(void); |
14 | 18 | ||
15 | #endif /* __ASM_I8253_H */ | 19 | #endif /* __ASM_I8253_H */ |