diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-01 14:05:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-09 09:01:39 -0400 |
| commit | 8e1b5adfbee97a187d3e7188a0b248619b76682e (patch) | |
| tree | 2add80ce5d4650f2a7d854e58f9490f62495dbf0 /sound/drivers/pcsp/pcsp.h | |
| parent | 16ba9b061223c8a58b9b2e0dd01435111c4e902a (diff) | |
i8253: Make pcsp sound driver use the shared i8253_lock
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Acked-by: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org
Link: http://lkml.kernel.org/r/20110601180610.532642190@duck.linux-mips.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'sound/drivers/pcsp/pcsp.h')
| -rw-r--r-- | sound/drivers/pcsp/pcsp.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h index 6757c304ee46..fc7a2dc410a1 100644 --- a/sound/drivers/pcsp/pcsp.h +++ b/sound/drivers/pcsp/pcsp.h | |||
| @@ -10,14 +10,8 @@ | |||
| 10 | #define __PCSP_H__ | 10 | #define __PCSP_H__ |
| 11 | 11 | ||
| 12 | #include <linux/hrtimer.h> | 12 | #include <linux/hrtimer.h> |
| 13 | #include <linux/timex.h> | ||
| 14 | #if defined(CONFIG_MIPS) || defined(CONFIG_X86) | ||
| 15 | /* Use the global PIT lock ! */ | ||
| 16 | #include <linux/i8253.h> | 13 | #include <linux/i8253.h> |
| 17 | #else | 14 | #include <linux/timex.h> |
| 18 | #include <asm/8253pit.h> | ||
| 19 | static DEFINE_RAW_SPINLOCK(i8253_lock); | ||
| 20 | #endif | ||
| 21 | 15 | ||
| 22 | #define PCSP_SOUND_VERSION 0x400 /* read 4.00 */ | 16 | #define PCSP_SOUND_VERSION 0x400 /* read 4.00 */ |
| 23 | #define PCSP_DEBUG 0 | 17 | #define PCSP_DEBUG 0 |