summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2011-06-01 19:05:03 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-06-09 15:01:39 +0200
commit8e1b5adfbee97a187d3e7188a0b248619b76682e (patch)
tree2add80ce5d4650f2a7d854e58f9490f62495dbf0
parent16ba9b061223c8a58b9b2e0dd01435111c4e902a (diff)
downloadtalos-obmc-linux-8e1b5adfbee97a187d3e7188a0b248619b76682e.tar.gz
talos-obmc-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>
-rw-r--r--sound/drivers/pcsp/pcsp.h8
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
OpenPOWER on IntegriCloud