diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2011-06-01 20:05:03 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-09 15:01:39 +0200 |
| commit | 8e1b5adfbee97a187d3e7188a0b248619b76682e (patch) | |
| tree | 2add80ce5d4650f2a7d854e58f9490f62495dbf0 /sound/drivers | |
| parent | i8253: Make pcspkr input driver use the shared i8253_lock (diff) | |
| download | linux-8e1b5adfbee97a187d3e7188a0b248619b76682e.tar.xz linux-8e1b5adfbee97a187d3e7188a0b248619b76682e.zip | |
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')
| -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 @@ #define __PCSP_H__ #include <linux/hrtimer.h> -#include <linux/timex.h> -#if defined(CONFIG_MIPS) || defined(CONFIG_X86) -/* Use the global PIT lock ! */ #include <linux/i8253.h> -#else -#include <asm/8253pit.h> -static DEFINE_RAW_SPINLOCK(i8253_lock); -#endif +#include <linux/timex.h> #define PCSP_SOUND_VERSION 0x400 /* read 4.00 */ #define PCSP_DEBUG 0 |